fast commit mantis

as
Merge branch 'master' of https://github.com/alwallace/ERSimWeb

Conflicts:
	ersim/extra/test.sqlite
	ersim/views.py