Drupal Grid JS

migration fixes
Merge branch 'master' of https://github.com/palasthotel/grid

Conflicts:
	core/templates/editor.html
	core/templates/images/_notes/dwsync.xml
	core/templates/main.css