Merge branch 'master' of https://github.com/tomaszszczerba/choose

Conflicts:
	Choose/app/scripts/services/imageService.js