update domain and rest model
Merge branch 'master' of https://github.com/aperusset/Gamification