Add ContentBoxManager
Merge branch 'develop'