test
test 1
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/com/mallgo/rest/UserRestBean.java