merged
Merge branch 'dev' of https://github.com/PROCERGS/login-cidadao.git into
dev

Conflicts:
	src/PROCERGS/LoginCidadao/CoreBundle/Resources/public/js/general.js
Merge branch 'dev' of https://github.com/PROCERGS/login-cidadao.git into dev
looks like my git go crazy again