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

Conflicts:
	WebRoot/WEB-INF/config/.struts-config.mex
系统开放时间设置