test
to branch
Merge branch 'master' of https://github.com/yanghui16355/HackQ2 into dev1

Conflicts:
	src/main/webapp/WEB-INF/views/main.jsp
	src/main/webapp/WEB-INF/views/resources/pages/js/load.js
local commit
Merge commit 'f003b1bf0d477cbcb38a99117c0a18aad25db835' into dev1

Conflicts:
	src/main/webapp/WEB-INF/views/resources/pages/js/load.js
to local dev
local
Merge pull request #1 from yanghui16355/dev1

Dev1