file delete
Merge branch 'develop'

Conflicts:
	PlanetBuster3.sln
	lib/tmlib.js
Merge branch 'develop' of https://github.com/minimo/PlanetBuster3 into develop