fixed

Change-Id: Ieeac3062473333841351e2d07726528992285ac5
Signed-off-by: Michal Velek <mvelek@gmail.com>
Merge branch 'master' of https://github.com/velim/TestApps

Conflicts:
	ThreadControl/src/cz/velim/threadcontrol/ThreadControl.java