Reorganized so that all routing is handled from the main control and not in sub controls
Merge branch 'master' of github.com:samium/ChinookMusic
Merge branch 'master' of github.com:samium/ChinookMusic