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

Conflicts:
	WebRoot/WEB-INF/config/struts-config.xml
	src/com/uic/web/struts/action/GoManageAccountUiAction.java