Changed reserved words for user/license entities
Merge pull request #49 from vibe13/master

Changed reserved words for user/license entities