added column widget
added column widget to integration task
Merge branch 'develop' into feature/column_widget
Merge branch 'develop' into feature/column_widget

* develop:
  bump version
  bugfix: forgot to change widget generator spec after changing edit view
  bugfix: developer bar: don't display obj class information on non cms page
  bugfix: remove teaser thumbnail, that gets generated automatically
  widget edit view pull request review
  update infopark gems
  bugfix: remove additional whitespace
  added edit backside generator
  added edit view for video-, person- and maps-widget
update to also check for edit view
usage references the dev center
remove column restriction
minor changes

+ add changelog entry
+ add example migration
+ fix class name with number
Merge branch 'feature/column_widget' of github.com:infopark/infopark_kickstarter into feature/column_widget
- changed position of the edit-marker
- changed css class in the show-view
added mixins to the infopark_override.css
changed highlighting behavior of structure widgets
changed border-color of the structure widget edit-marker
resolved merge conflicts
pull request review
cleanup javascript and css
Merge branch 'develop' into feature/column_widget

* develop:
  Update README.md
  Fix documentation
  remove custom.yml
Merge branch 'develop' into feature/column_widget

* develop:
  check in test_app for better diffs during development

Conflicts:
	CHANGELOG.md
Merge branch 'develop' into feature/column_widget

* develop:
  bugfix: load better_errors in development only to prevent segmentation fault
  add dependency on bootstrap 2

Conflicts:
	CHANGELOG.md
integrate project feedback

+ use public api instead of additional self made div layer
+ insert empty edit.html.haml so that the edit view is not broken
+ use a green border color for structure widgets
Merge branch 'feature/column_widget' into develop

* feature/column_widget:
  integrate project feedback
  cleanup javascript and css
  pull request review
  changed highlighting behavior of structure widgets changed border-color of the structure widget edit-marker
  added mixins to the infopark_override.css
  - changed position of the edit-marker - changed css class in the show-view
  minor changes
  remove column restriction
  usage references the dev center
  update to also check for edit view
  added column widget to integration task
  added column widget