FRONT END- Estruturando links na programação
Merge branch 'master' of https://github.com/FabianodeLimaAbreu/TCC

Conflicts:
	WebContent/index.jsp
	WebContent/load.xml