Merged with remote master
Added lines to the client, conductor and dancer views to (obstensively) keep them from going to sleep while the app is running
a little more server touching up
merge master with minor server updates
Merge branch 'master' into updateClient
Clients in show mode reset to one when MC is reset. MC handles touch and click events depending on enviornment.
Changed added touchend + mousedown events for all clickable elements on client and conductor. This keeps the event from firing twice, but allows them all to be used and be responsive on mobile and desktop
Merge branch 'updateClient' of https://github.com/kinetech/Performance into updateClient
More fixes to the touch events on mobile devices.
Merge branch 'master' of https://github.com/kinetech/Performance
Merge branch 'updateClient'