Adds temporary splash page
Merge remote-tracking branch 'origin/master' into develop

* origin/master:
  Adds temporary splash page

Conflicts:
	Gemfile
	Gemfile.lock
	app/assets/stylesheets/application.css
	app/controllers/application_controller.rb
	app/views/application/application.html.erb
	config/routes.rb