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