URL da funcionalidade OK
Merge branch 'master' of https://github.com/gtcarlos/controle_acesso

Conflicts:
	Gemfile
	Gemfile.lock
	app/assets/stylesheets/application.css
	app/controllers/home_controller.rb
	app/models/funcionalidade.rb
	app/models/grupo.rb
	app/models/usuario.rb
	app/views/home/_usuarios.html.erb
	app/views/home/index.html.erb
	app/views/home/main.html.erb
	db/schema.rb