Merge pull request #273 from ebbyw/master

merging
Open Kit Integration Kick Off
Open Kit Integration related changes
Merge pull request #274 from ebbyw/Ebby

Ebby