Fix import of xml.etree.ElementTree
Make sure script ends with 'Script End' instead of triggers[16]
Merge branch 'master' into Gotham
version bump
Merge branch 'master' into Gotham

Conflicts:
	addon.xml