Frontend
Merge branch 'master' of https://github.com/sharker86/Procuidado.git

Conflicts:
	.classpath
	WebContent/WEB-INF/pom.xml