Pequena atualização para corrigir o upgrade.
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/Cacic/CommonBundle/Resources/data/upgrade-3.0b3.sql