New Remote Store Services
Merge remote-tracking branch 'origin/master'

Conflicts:
	CollaboRhythm.Hiviva/src/resources/settings.sqlite