Added Model data structures from control condition
Added changes to performSetupForActivity and convertActionStepToPossibleInteraction
Added missing functionality from PMViewController.m in control condition
Added InteractionModel changes from control condition; more code cleanup
Added EBookImporter.m changes from control condition
Fixed minor errors from merging changes
Merged control and menu condition and cleaned up code