no change
Merge remote-tracking branch 'origin/master'

Conflicts:
	WEB-INF/classes/cn/edu/tju/t6/c4/base/CommonConst.class
	WEB-INF/classes/cn/edu/tju/t6/c4/base/DBOperator.class
	WEB-INF/classes/cn/edu/tju/t6/c4/dao/ApplicationDao.class
	WEB-INF/classes/cn/edu/tju/t6/c4/dao/UserDao.class
	WEB-INF/classes/cn/edu/tju/t6/c4/filter/OperatorCheckFilter.class
	WEB-INF/classes/cn/edu/tju/t6/c4/service/RecordService.class
	WEB-INF/classes/cn/edu/tju/t6/c4/service/RecordServiceImpl.class
	WEB-INF/classes/cn/edu/tju/t6/c4/web/RecordController.class
	WEB-INF/classes/cn/edu/tju/t6/c4/web/UserController.class
	WEB-INF/src/cn/edu/tju/t6/c4/filter/OperatorCheckFilter.java
	WEB-INF/src/cn/edu/tju/t6/c4/service/RecordServiceImpl.java
	WEB-INF/src/cn/edu/tju/t6/c4/web/RecordController.java
	letsleave/app/scripts/controllers/controllers.js
	letsleave/app/views/editApplication.html
	letsleave/app/views/recordView.html