change uploadTopic.html page
 supervisor's select box to input box
commit teacher upload
Merge remote-tracking branch 'origin/master'

Conflicts:
	WebRoot/WEB-INF/config/.struts-config.mex
	WebRoot/WEB-INF/config/struts-config.xml