Added User class to data model
Added pbxproj updates
Merge branch 'Bradley'