Merge branch 'kylesziv-master'

Conflicts:
	app/components/host-thumb.js
	app/templates/application.hbs