fixed merge conflict and added file upload stuff to discussion
fixed merge conflict and added file upload stuff to discussion

SakoGuru/PIPSQUEAK,SakoGuru/PIPSQUEAK,SakoGuru/PIPSQUEAK,SakoGuru/PIPSQUEAK,SakoGuru/PIPSQUEAK,SakoGuru/PIPSQUEAK,SakoGuru/PIPSQUEAK