Merge remote-tracking branch 'origin/disable-drag-on-rightclick' into disable-drag-on-rightclick

# Conflicts:
#	src/components/dragelement/index.js
#	test/jasmine/tests/dragelement_test.js

Author: Alex Vinober