TB plugin
Merge branch 'master' of https://github.com/fp7-alien/OCF-TBPlugin