Finished fixing problems caused by new requirement on User schema.
Merge branch 'c1moore_branch' into dev