Actualizacion de index Alumno debido a problemas surgidos despues de mezcla de cambios
Cambios al controller Empleado/responsabilities
PracticaProfesionalController, a mayudculas
Merge branch 'master' of https://github.com/leosuncin/RegistroAcademicoINTI

Conflicts:
	app/Resources/TwigBundle/views/Exception/error.html.twig
	src/INTI/RegistroAcademicoBundle/Controller/AlumnoController.php
	src/INTI/RegistroAcademicoBundle/Controller/CodigoEspecialidadController.php
	src/INTI/RegistroAcademicoBundle/Controller/EmpleadoController.php
	src/INTI/RegistroAcademicoBundle/Controller/EmpresaController.php
	src/INTI/RegistroAcademicoBundle/Controller/PracticaProfesionalController.php
	src/INTI/RegistroAcademicoBundle/Entity/Alumno.php
	src/INTI/RegistroAcademicoBundle/Form/EncargadoType.php
	src/INTI/RegistroAcademicoBundle/Form/PracticaProfesionalType.php
	src/INTI/RegistroAcademicoBundle/Repository/AlumnoRepository.php
	src/INTI/RegistroAcademicoBundle/Resources/public/css/estilo.css
	src/INTI/RegistroAcademicoBundle/Resources/public/js/enmascarar-formularios.js
	src/INTI/RegistroAcademicoBundle/Resources/public/js/plantillas.js
	src/INTI/RegistroAcademicoBundle/Resources/sql/RegistroAcademicoINTI.mwb
	src/INTI/RegistroAcademicoBundle/Resources/views/Alumno/show.html.twig
	src/INTI/RegistroAcademicoBundle/Resources/views/CodigoEspecialidad/show.html.twig
	src/INTI/RegistroAcademicoBundle/Resources/views/PracticaProfesional/new.html.twig