API documentation has been updated (IServiceLocator). Little code clean-up.
Merge branch 'develop' into demo_prototype