Android extentions added
Merge remote-tracking branch 'origin/master'

Conflicts:
	CollaboRhythm.Hiviva/CollaboRhythm.Hiviva.iml
Merge remote-tracking branch 'origin/master'

Conflicts:
	CollaboRhythm.Hiviva/CollaboRhythm.Hiviva.iml