Merge branch 'develop' into staging

Conflicts:
	test/factories/sequences.rb
	test/factories/user.rb
Merge branch 'feature/edit_admin_panel_#104' into staging
Merge branch 'feature/move_news_page_to_main_page_#79' into staging