events page work
Merge branch 'dhagen-new' into dev-master