Fix for Jenkins(again)
Merge branch 'develop' of https://github.com/openeyes/OpenEyes into develop
Fix for Jenkins(again)
+ additional method abstractions to ease testing
+ further BaseEventTypeController tests
Clean up model tests.