background image
Merge branch 'master' of https://github.com/claytongulick/kicktravel

Conflicts:
	public/modules/core/views/home.client.view.html
Merge branch 'master' of https://github.com/claytongulick/kicktravel