Mudancas servido
Merge branch 'devel'
Commit master server
Mudancas no servidor - Master
Merge branch 'master' into devel

Conflicts:
	Gemfile
	Gemfile.lock
	app/assets/stylesheets/style.css
	app/views/layouts/application.html.erb
	config/database.yml
Style cadastrar