add user resource
Merge branch 'master' into githubshare