EndOfMerge
Refactored StartUpWizzard and CafeteriaActivity