merge
Merge branch 'master' of https://github.com/afn1989/administra.git

Conflicts:
	administra/src/main/java/br/com/administra/controle/managebean/GestorMB.java