remove unnecessary stuff
visual recognition of drag and drop
Merge branch 'master' into gh-pages