Merge pull request #6 from WOYM/master

Update
#28  LocationController
Fixes #68
Merge pull request #7 from WOYM/master

Update
#68 | Fehler behoben, Mockito baut nun
#68 | Fixes the database-problem. Controller should not be serializable...
#68 | Cleaned up the mess I left behind.
#68 | Changed Bezeichner of ActivityType to Name, cleaned ActivityTypeNameValidator and added Tests
Merge pull request #69 from tihansen/master

Fixes #68 | Some work on #28 reviewed