Merge pull request #75 from claudius108/master

Fixes for cluster repository editor and acc. to ticket #721