Refactoring service locator's config files.
Changing anonymous function to factories.
Merge remote-tracking branch 'origin/master'