fix
conversations removed
Merge branch 'messages'
user model cleaned
Added calender and bookings to homepage
bookinng test
Merge remote-tracking branch 'upstream/master'
fix merg