Merge pull request #74 from teotigraphix/master

Removed currentMode, previousMode global variables from push.control
Removed masterTrack from global scope, Push.control
Added MasterTrackProxy in Model, replaced all usages.