added basic template of user class
Merge branch 'master' into dev