Heavily modified the user object
pre-merge
Merge branch 'tempDev'
Fixed conflict