collections in images
Merge branch 'master' of github.com:miksturait/cloud-board

Conflicts:
	app/controllers/images_controller.rb