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

Conflicts:
	Choose/app/styles/main.css
	Choose/app/styles/main.less