gui's version
Merge branch 'Atlas'
Merge branch 'Gui'

Conflicts:
	CoryDash.js
	CoryDash_v2.js
merge conflict dealt
new v2
Merge branch 'Gui'
Merge branch 'master' into Atlas