role, panel admina
Merge branch 'psuminski'

Conflicts:
	Gemfile.lock
	app/controllers/users_controller.rb
bleble
Merge branch 'master' into mikolaj
migracja
Merge branch 'psuminski'
menu
menu
tempy
tempy
Merge branch 'master' into mikolaj
gemlock II