Add Message and User into Model
Merge branch 'develop'