Removed extra files
build file modifications
Merge branch 'testing'
Merge branch 'develop'

Conflicts:
	Icons/convert.py
	Other Stuff/Icons/convert.py
	build.sh
	build/PhysPro.src.lua
	build/etk.lua
	other/EEPro.tns
	other/FormulaPro.tns
	other/FormulaProExtDB.tns
	other/icons/convert.py