tinkered with ControllerFragment
fixed missing Fragment class
Merge remote-tracking branch 'origin/master'