临时提交缓存
整合了杨润青的修改, 解决了数据库无法写入的问题.
TO DO: Error occured at line 32 in ElectDao.java while login.
Merge branch 'master' of https://github.com/zjhzxhz/emis

Conflicts:
	src/main/webapp/accounts/dashboard.jsp
	src/main/webapp/assets/fonts/fontawesome-webfont.eot
	src/main/webapp/assets/fonts/fontawesome-webfont.svg
	src/main/webapp/assets/fonts/fontawesome-webfont.ttf
	src/main/webapp/assets/fonts/fontawesome-webfont.woff