Updated user serialization code to work with both Crowd and local authentication

* Updated the user serialization and deserialization code to work with both authentication
methods
Merge branch 'auth-serialization-fix' into dev

* auth-serialization-fix:
  Updated user serialization code to work with both Crowd and local authentication