prototype of gridmanager-integration

added a comfy-tag, so you can now use {{
cms:page:some_label:grid_manager }}
Merge branch 'feature/gridmanager' into develop

* feature/gridmanager:
  prototype of gridmanager-integration

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