Ultimos cambios
Merge branch 'master' of github.com:archie18/MeloLabEva.git

Conflicts:
	src/MeloLab/EvaBundle/Resources/views/Translational/showinfo.html.twig
Lala
Merge branch 'master' of github.com:archie18/MeloLabEva
Patentes funcional :D
Merge branch 'master' of github.com:archie18/MeloLabEva