Merge remote-tracking branch 'origin/master'

Conflicts:
	CollaboRhythm.Tablet/src/resources/settings.xml
Merge remote-tracking branch 'origin/master'

Conflicts:
	CollaboRhythm.Tablet/src/resources/settings.xml