incorporate mscweb
Merge branch 'mscweb_rebased' of https://github.com/pkediyal/coi-services
Merged mscweb
Merge pull request #1247 from mmeisinger/master

Final merge of mscweb