Merge branch 'master' into force

Conflicts:
	front-end/squt.js
Merge branch 'force' of https://github.com/ducksmanager/squt into force

Conflicts:
	front-end/squt.js