finally ...
Merge branch 'master' of https://github.com/pi13/sw14_free_07.git

Conflicts:
	LVMaster3000/src/at/lvmaster3000/MainActivity.java