adjusting css on front-end
GET method for inbox
updated develp with master
fixed contact list bug
Resolve conflicts
Merge branch 'development'