Merge
Merging ofline changes.
Got a basic interface "working" with dropzone.js. Uploads still need to be handled.