Incomplete work
Merge branch 'master' of github.com:PROCERGS/login-cidadao

Conflicts:
	src/PROCERGS/LoginCidadao/CoreBundle/Entity/Person.php