Adding twitter support...
Merge branch 'master' of github.com:PROCERGS/login-cidadao
Basic twitter config almost ready, but missing proxy config...
Trying to setup twitter via HWIOAuthBundle...
FOSTwitterBundle was a PITA. Switched back to HWIOAuthBundle just for twitter. Kinda woring now. :)
Merge branch 'master' of github.com:PROCERGS/login-cidadao

Conflicts:
	composer.lock
	src/PROCERGS/LoginCidadao/CoreBundle/Resources/config/services.yml