desktop messenger page
Merging issue-14 into develop and resolving conflicts