resolve confic
ok user controllerSpec
Merge branch 'master' of https://github.com/FlorentMouysset/pastog

Conflicts:
	grails-app/domain/ups/pastog/user/User.groovy