Security
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/org/yijun/hie/controller/ManageController.java
	src/main/java/org/yijun/hie/controller/TestController.java