Rename 'UserClass' to 'UserClassEnum'
Use proper case username
Compiled Version
Merge master into compiled