dropzone button now resets the dropzone area
fixed conflicts
Merge pull request #14 from johnlok/reset_dropzone_merge

Reset dropzone merge