Merge branch 'master' of https://github.com/isaacdontjelindell/duty-calls

Conflicts:
	web2py/applications/duty_calls/controllers/admin.py
	web2py/applications/duty_calls/views/admin/locations.html