Added chat models
Added chatContext
Merge branch 'feature/27' into develop