#gt-125 work 6h
#gt-125 work 2h
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/controllers/landing_controller.rb