Merge branch 'feature/add_rails_admin' into develop
Adding tours
State machine
Adding competitions
Migrations and factories
Merge branch 'feature/competions_and_tours' into staging

Conflicts:
	Gemfile
	config/routes.rb