testing update

ks4 testing
Merge remote-tracking branch 'origin/master'

Conflicts:
	resources/scripts/backup/backupdata.cmd