paso 2 registro
Merge branch 'master' of https://github.com/nachodegrau/witbeat

Conflicts:
	src/Witbeat/DBBundle/Entity/Usuario.php