removed dropzone, trying to fix triggers
Merge branch 'master' of https://github.com/SerendipityNL/Doctopus

Conflicts:
	beta/002/public/js/yellow_text.js