学生选择时间基本完成
Merge branch 'master' of
https://github.com/UIC-FYP-2014-Fall/FYP-Coordination-System

Conflicts:
	src/com/uic/service/imp/StudentServiceImp.java
	src/com/uic/service/inter/StudentServiceInter.java