Fixed bug in servicelocator.
Updated phpdoc
Fixed injection of service locator.