prepare to merge with chat
Merge branch 'homeScreen' into development