alteracoes
alteracoes
Merge branch 'leticia2' of http://github.com/marlonacademi/smartbarselet into leticia2

Conflicts:
	errorlog.html