varias modificações em layout
layout
Merge branch 'master' of https://github.com/wenderdalber/salaobyme2

Conflicts:
	.idea/workspace.xml
	target/stacktrace.log