panel admina
panel admina
Merge branch 'psuminski'

Conflicts:
	app/controllers/users_controller.rb
	config/routes.rb