Changed template
Merge branch 'master' of github.com:ericatharvard/shao

Conflicts:
	queue/admin.pyc
Merge branch 'master' of github.com:ericatharvard/shao

Conflicts:
	templates/email_3.txt
	templates/email_user.txt
static files fix