merge effin changes
Merge branch 'develop' of github.com:miguelverissimo/Receitas-Engenharia-Software into develop

Conflicts:
	src/main/webapp/WEB-INF/views/home.jsp
SOLVED USING MINE!
fix merging issues