update from Tammy and John
Merge remote-tracking branch 'origin/master'
removed obstacles tab; linked events tab to controller