a
Merge branch 'dev' of https://github.com/PROCERGS/login-cidadao.git into dev
a
well lets try
merged?
Merge branch 'dev' of https://github.com/PROCERGS/login-cidadao.git into
dev

Conflicts:
	src/PROCERGS/LoginCidadao/CoreBundle/Resources/views/Default/index.html.twig
	src/PROCERGS/LoginCidadao/CoreBundle/Resources/views/Person/registration/register.html.twig