added short id support for users
better approach to overall shortid support
Merge branch 'shortid' into dev