show/hide teacher forms
merge
merge
Merge origin/master

Conflicts:
	sandbox/www/js/main.js