cambios entidades
Merge branch 'master' of github.com:giorgosbarkos2/mambo

Conflicts:
	src/avisapp/adminBundle/Controller/UsuarioController.php
	src/avisapp/adminBundle/Form/UsuarioType.php
	src/avisapp/adminBundle/Resources/config/routing.yml