Add data model
solve merge conflict
Merge branch 'dev' into feat/profilePage