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

Conflicts:
	src/PROCERGS/OAuthBundle/Entity/Client.php