Class user
Merge branch 'userclass'