Un commit
Merge branch 'master' of https://github.com/alexhumar/symfony2_UM

Conflicts:
	src/Salita/UsuarioBundle/Form/Type/UsuarioType.php
Merge branch 'master' of https://github.com/alexhumar/symfony2_UM

Merge por conflicto en UsuarioType.php
Merge branch 'master' of https://github.com/alexhumar/symfony2_UM

A
com
Merge branch 'master' of https://github.com/alexhumar/symfony2_UM

A
Merge branch 'master' of https://github.com/alexhumar/symfony2_UM

A
Merge branch 'master' of https://github.com/alexhumar/symfony2_UM

asda
A