Alterações
Merge branch 'master' of https://github.com/HoraDoAlmoco/LunchTime

Conflicts:
	LunchTime/WebContent/adicionarPersonalizadoTemplate.html
	LunchTime/WebContent/adicionarTemplate.html
	LunchTime/WebContent/js/lunchTime.js