test
-
-
-
-
-
-
-
Merge remote-tracking branch 'origin/v0.5'

Conflicts:
	src/Anuncios/AnuncioBundle/Controller/Backend/CampaignController.php