Fix sample readme file, and a minor fix to the server.
Fix formatting
merge fixes
CR feedback on changes to README.md
Remove calendar readme from this branch
Add new sample to master readme