Merge pull request #1 from Amstutz/master

Fixed link to parent object in categories
Merge pull request #2 from studer-raimann/develop

Bugfix in Category-Table
Several changes in views
Merge remote-tracking branch 'Upstream_-_Studer-Raimann/master'
Several changes on Table