images detection
Merge branch 'master' of https://github.com/blabassi/houston

Conflicts:
	client/collection_view.html