Merge branch 'devel' into feature/admin_page

Conflicts:
	config/routes.rb
	spec/support/page_objects/admin_page.rb
	spec/support/page_objects/profile_page.rb