Merge

dropzone.less incomplete