Merge branch 'develop' into feature/column_widget
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