Merge branch 'feature/gridmanager' into develop

* feature/gridmanager:
  prototype of gridmanager-integration

Conflicts:
	app/assets/javascripts/comfortable_mexican_sofa/application.js.coffee