Added standard setting shortcuts (Cmd+,) on Mac
uses of AbstractMockService changed to use MockService instead
extracts interfaces from MockService
removes unused generics
adds override annotations