sync
Merge branch 'master' of https://github.com/lionel126/scriptish_scripts

Conflicts:
	scriptish-config.json