add UID to user
Merge branch 'release'
Merge branch 'master' of github.com:fairnopoly/fairnopoly