Small fixes
Merge branch 'master' of https://github.com/Desocrit/Scripting

Conflicts:
	static/ajax.js
Merge branch 'master' of https://github.com/Desocrit/Scripting