fixed email bug
Merge branch 'master' of github.com:ericatharvard/shao

Conflicts:
	queue/views.pyc