Update to edgehero 1.2
Merge branch 'master' of https://github.com/edgehero/Edgehero

Conflicts:
	min version/edgehero/edgeherostyle.css