Fix password reset
Merge branch 'refs/heads/dev'
"free" removed from ed page
Merge branch 'refs/heads/dev'
Make sure loggedIn is set in the area create page
Concurrency bug attempt to fix
Revert "Merge branch 'refs/heads/dev'"

This reverts commit d5646571c89da1ff308df0e3132ab19f2483c9fb, reversing
changes made to 631e353a7aaf93cead850617994f8002b8bfc249.
Fix concurrecy, V2
Updated logging for concurrency problem
More debugging code for concurrency issue
Debugging fixes for transactional update
Concurrency REDO
Concurrency Fix
Catch transaction failure and display to user
Merge branch 'refs/heads/dev'

Conflicts:
	models/areauser.py
	models/point.py
New roster view
Revert "Revert "Merge branch 'refs/heads/dev'""

This reverts commit 1a645abd0739a392f20764fe00b8f8567c61a67e.

Conflicts:
	models/areauser.py
Pass error out of transactional update
Apply V1 fix and V2 fix for concurrency together to see if it can work
Attempt to fix error message