CERES: Get rid of some debug stuff
Merge branch 'ceres' of ssh://helios/home/git/repositories/Nova into ceres

Conflicts:
	Ceres/src/com/datasoft/ceres/MainActivity.java