Pivotal 61346886, 61346880, 62439830.  Refactored controls to be sub-classes of MGButton.  Refactored AppState and button state handling.  Fixed issue of controls sticking on when rotating and saving.