Menu de usuarios e grupos, logout e relacionamentos aplicados
Relacionamentos, login e menu de funcionalidades - OK
Merge branch 'master' of github.com:gtcarlos/controle_acesso

Conflicts:
	app/assets/stylesheets/application.css
	app/controllers/home_controller.rb
	app/models/funcionalidade.rb
	app/views/home/main.html.erb
	config/routes.rb
Validacao de login OK, menu dinamico OK, falta link p/ menu
Merge branch 'master' of https://github.com/sipuccamp/controle_acesso

Conflicts:
	Gemfile
	app/assets/stylesheets/application.css
	app/controllers/home_controller.rb
	app/models/funcionalidade.rb
	config/routes.rb
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/views/home/_usuarios.html.erb
	app/views/home/index.html.erb
	config/routes.rb
Controle de acesso ok, menu dinamico ok, link do menu faltando