changed UI, temp-reading, current measuremet in main
Merge branch 'master' of https://github.com/bonhomat/2013-ETP2

Conflicts:
	globals.h
	ui.c