fixed failing membership controller test, refactored 8c4d7b2909 (#11)
Merge branch 'master' of github.com:kir-dev/simonyi-cimtar