started cometservice page
cometservice page
resolving conflicts and merging issue-26 into develop