Finished fixing problems caused by new requirement on User schema.
Merge branch 'c1moore_branch' into dev
Merge remote-tracking branch 'origin/dev' into james_branch