Merge branch 'master' of
https://github.com/UIC-FYP-2014-Fall/FYP-Coordination-System.git

Conflicts:
	WebRoot/WEB-INF/logined/Teacher/editTopic.jsp
	WebRoot/WEB-INF/logined/Teacher/uploadTopic.jsp
Merge branch 'master' of
https://github.com/UIC-FYP-2014-Fall/FYP-Coordination-System.git

Conflicts:
	WebRoot/WEB-INF/logined/Teacher/editTopic.jsp
	WebRoot/WEB-INF/logined/Teacher/uploadTopic.jsp