Merge branch 'master' of https://github.com/barrygearing/CollaboRhythm_hiViva

Conflicts:
	CollaboRhythm.Hiviva/src/collaboRhythm/hiviva/view/media/Assets.as
Merge remote-tracking branch 'origin/master'