switched out createuser response to be uid instead of int id
Merge branch 'develop'