WIP images
Merge remote-tracking branch 'remotes/origin/master'

Conflicts:
	app/js/controllers.js
	app/partials/collections-search.html
WIP browse images