last cleanup before presentation
Merge branch 'master' of github.com:TNG/schizophrenia
fix bar toggle
Merge branch 'master' of github.com:TNG/schizophrenia

Conflicts:
	src/main/resources/quick-switch-bar/template.soy