thanks from ian
Merge remote-tracking branch 'upstream/master' into marlier

Conflicts:
	app/templates/home.hbs