song change
lib changes
Merge remote-tracking branch 'origin/mk-jp-generate-initial-models' into mk-jp-generate-initial-models

Conflicts:
	app/views/home/home.html.erb