Change trigger name
Merge branch 'develop' of github.com:confa/DnD into develop

Conflicts:
	main.js
Merge branch 'develop' of github.com:confa/DnD into develop
Changes styles