Merge remote-tracking branch 'upstream/master' into Log-Improvements

Conflicts:
	gui.js

git commit
Merge branch 'Log-Improvements' of https://github.com/Bakasan15/Sandcastle-Builder into Log-Improvements

Conflicts:
	gui.js