home chnges
Merge remote-tracking branch 'origin/mk-jp-generate-initial-models' into mk-jp-generate-initial-models

Conflicts:
	app/assets/javascripts/home.js