Merge pull request #15 from SartoriusEarth/develop

Admin client, some porting of controller tests.
ported more tests. Still need to port Survey and SurveyResponse tests.