Sincronizando.
Merge branch 'master' of https://github.com/1028/projeto.git

Conflicts:
	WebContent/principal.jsp
	build/classes/.gitignore