heat test
cleanup
Merge branch 'develop'

Conflicts:
	LabImport/dev/maps.js
Merge pull request #3 from Azimuth1/develop

Develop