Update user model
Merge branch 'jgdev' of github.com:idl/SBA3 into dev