client assembling
Merge remote-tracking branch 'origin/master'

Conflicts:
	CloudSync/MasterServer/src/cloudsync/master/MasterSettings.java