Moved ScriptServices creation to ScriptServicesFactory because of SRP
Merge branch '331' of https://github.com/filipw/scriptcs into 331