Terminando o trabalho o/
Merge origin/master

Conflicts:
	SMH2-desktop/src/java/smh2desktop/TelaPrincipal.java