Refs #472 Events controller with left menu selector
Refs #472 Tweaks
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'