role, panel admina
Merge branch 'psuminski'

Conflicts:
	Gemfile.lock
	app/controllers/users_controller.rb