Changed controllers to get from LogicFacade. Allows CommandLineController access PhantomController
Merge remote-tracking branch 'origin/krystal'