Merge (working on getting all indivo2 changes into master)
Merge (working on getting all indivo2 changes into master)
Merge branches 'indivo2' and 'master' of github.com:newmediamedicine/CollaboRhythm