Graident  added
Merge remote-tracking branch 'origin/mk-jp-generate-initial-models' into mk-jp-generate-initial-models

Conflicts:
	app/assets/javascripts/landing.js
	app/assets/stylesheets/landing.css