testing again
Merge remote-tracking branch 'origin/earnbook' into earnbook

Conflicts:
	earnbook-svcs/src/java/svcs/com/earnbook/ebs/user/service/impl/UserServiceImpl.java
testing again