OR not AND on the event classes.
Merge branch 'master' of github.com:web-arts-unimelb/unimelb
Merge branch 'master' of github.com:web-arts-unimelb/unimelb
Merge branch 'master' of github.com:web-arts-unimelb/unimelb
Merge branch 'master' of github.com:web-arts-unimelb/unimelb
Merge branch 'master' of github.com:web-arts-unimelb/unimelb
Merge branch 'master' of github.com:web-arts-unimelb/unimelb
Commit pending theme changes. Block tpl and event view.