update timetable (except the opentime control)
Merge branch 'master' of
https://github.com/UIC-FYP-2014-Fall/FYP-Coordination-System

Conflicts:
	WebRoot/WEB-INF/config/.struts-config.mex
	WebRoot/WEB-INF/config/struts-config.xml
	src/com/uic/service/imp/FYPServiceImp.java