working on fbs each
Merge remote-tracking branch 'origin/master'

Conflicts:
	cache/win_32/setup.json
	src/js/ScriptGUI.js
	src/js/sim_process.js
	src/js/simulate.js