test
commit test
Merge branch 'master' of https://github.com/yes0625/AnbFrameForWeb-1
into yes0625-master

Conflicts:
	com.anbtech.anbframe.web/src/main/java/com/anbtech/anbframe/anbweb/UserController.java
	com.anbtech.anbframe.web/src/test/java/com/anbtech/anbframe/BasicTest.java
	com.anbtech.anbframe.web/src/test/java/com/anbtech/anbframe/UserServiceTest.java