osapi feature
Merge branch 'conext-dev' of github.com:conext/shindig into conext-dev