Merge branch 'cherub-templating'
Organize events and clean up tab switching
Add app toggling functionality

- Clicking the minus sign shows and hides the app
(Stolen from the answer suggestion app)
Merge branch 'master' into cherub-templating