Removed inheritance from BOTextManager
Merge remote-tracking branch 'origin/master' into test