Teste Merge
Merge branch 'master' of https://github.com/campisano/SMAL.git

Conflicts:
	smal/src/main/java/br/com/smal/domain/Status.java
Merge branch 'master' of https://github.com/campisano/SMAL.git