Updating User Service
Merge remote-tracking branch 'origin/master'

Conflicts:
	vcrud-core/src/main/java/org/ddelizia/vcrud/core/service/user/UserService.java
	vcrud-core/src/main/java/org/ddelizia/vcrud/core/service/user/impl/UserServiceImpl.java