Merge branch 'release/1.5' into develop
+ switch to using new refactor BaseEventTypeController
+ changes to init methods for actions
+ further base controller refactor work
+ fix examination printing for controller refactor