change activity
Merge branch 'master' of https://github.com/YouBenshan/lion

Conflicts:
	src/main/webapp/resources/site/student/student.jpg
change database
disable user create