melhoria layout lotações
Merge branch 'master' of https://github.com/sikora/SCP

Conflicts:
	app/views/lotacoes/index.html.haml