Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/runConfigurations/CollaboRhythm_Tablet___Emulator__1024_x_600_.xml
Merge remote-tracking branch 'origin/master'