Eliminado link registrar empresa d principal empresa
Merge branch 'master' of https://github.com/miquelarranz/PES.git
Merge branch 'master' of https://github.com/miquelarranz/PES.git

Conflicts:
	Borsa/src/Borsa/EmpresaBundle/Resources/views/Empresa/principalEmpresa.html.twig
Stupid merges
Merge branch 'master' of https://github.com/miquelarranz/PES.git

Conflicts:
	Borsa/src/Borsa/EstudianteBundle/Resources/views/Estudiante/busquedaDePerfiles.html.twig
	Borsa/src/Borsa/ProfesorBundle/Resources/views/Profesor/busquedaDePerfiles.html.twig
Merge branch 'master' of https://github.com/miquelarranz/PES.git

Conflicts:
	Borsa/src/Borsa/DenunciaBundle/Controller/DenunciaController.php
	Borsa/src/Borsa/DenunciaBundle/Resources/views/Default/formularioDeDenunciaDePerfil.html.twig
	Borsa/src/Borsa/DenunciaBundle/Resources/views/Default/listadoDeDenunciasSinResolver.html.twig