Add LightInject
Merge branch 'develop'