no more magic numbers in server/
Merge remote-tracking branch 'origin/resolutie-settings' into resolutie-settings

Conflicts:
	src/common/Settings.js