On-server customizations
Merge branch 'master' of https://github.com/Brickimedia/generalscripts

Conflicts:
	update.sh