Cf framework merge Add necessary require_relatives for MasterController and remove inapp…