Fixed OEMigration to insert/update event types
Merge branch 'develop' of github.com:openeyes/OpenEyes into develop
Merge branch 'develop' into feature/front-end-rewrite