dsfsdf
Merge branch 'master' of https://github.com/gustavobhweb/painel

Conflicts:
	public/static/css/defaults/defaultAuth.css