adding dropzone for batch image uploading
fixed merge conflicts
Merge pull request #23 from afalsario/afalsario

Afalsario