Merge branch 'develop' of git://github.com/modulargaming/user
Merge branch 'develop'
License
License
Merge branch 'master' into develop