Added ComponentManager
Merge branch 'master' of https://github.com/BigFoot1989/MPS.git