Novo Teste
Merge branch 'master' of https://github.com/ThiagoAnunciacao/cloudesk

Conflicts:
	Gemfile
	Gemfile.lock
	config/application.rb
	config/environment.rb
	config/locales/devise.pt-BR.yml
	config/mongoid.yml
merge