rewrote ServiceLocator - continue work on dominoRunner
Merge remote-tracking branch 'Roland's/roland' into nathan