gui's version
Merge branch 'Gui'

Conflicts:
	CoryDash.js
	CoryDash_v2.js