Merge remote-tracking branch 'origin/master'

Conflicts:
	CollaboRhythm.Android.DeviceGateway/gen/collaboRhythm/android/deviceGateway/Manifest.java