Merge branch 'Gui'

Conflicts:
	CoryDash.js