fixed labels, conversions, more generalized functions, just nicer!
Merge branch 'master' of https://github.com/henrihs/utmview

Conflicts:
	demoTest/GUI.py