root
gMerge branch 'master' of https://github.com/leosuncin/RegistroAcademicoINTI

Conflicts:
	src/INTI/RegistroAcademicoBundle/Controller/PeriodoController.php~
	src/INTI/RegistroAcademicoBundle/Form/PeriodoType.php~