restrict resource to user
Merge branch 'develop'