In progress
#gt-183 Fixed work 2d2h
Merge remote-tracking branch 'origin/master'

Conflicts:
	Gemfile.lock
	app/assets/images/landing.styl
	app/assets/stylesheets/landing.styl
	app/assets/stylesheets/lib/landing.styl
	app/controllers/landing_controller.rb
	app/views/landing/index.slim
	config/database.yml