Merge origin/master

Conflicts:
	src/main/java/br/com/testeproject/domain/User.java