second try
Merge branch 'AndyBranch'

Conflicts:
	src/com/rt/ui/AbstractRuntimeActivity.java
	src/com/rt/ui/PlanningActivity.java
	src/com/rt/ui/RunningActivity.java