Ajustes
Merge branch 'master' of https://github.com/tiagobarretomc/transmetaisWeb

Conflicts:
	WebContent/WEB-INF/classes/.gitignore