Renamed unity container manager
Merge branch 'develop'