Gemfile: fix strong_parameters requirement
Merge branch 'dev' into feature/user-profile

Conflicts:
	Gemfile.lock
Merge branch 'feature/user-profile' into staging

Conflicts:
	app/admin/pages.rb
	config/locales/pl.yml