30 dic
Merge branch 'master' of github.com:vmonsalve/sysAdmin

Conflicts:
	app/cache/dev/appDevUrlGenerator.php.meta
	app/cache/dev/appDevUrlMatcher.php.meta
	app/cache/dev/profiler/index.csv
	app/logs/dev.log
	src/projectAdmin/loginBundle/Controller/DefaultController.php
	src/projectAdmin/loginBundle/Resources/views/Default/formularioCategoria.html.twig