Fix some service crashes
Merge branch 'master' of https://github.com/kepang/Milestone

Conflicts:
	bin/Milestone.apk
	bin/classes.dex
	bin/classes/com/example/milestone/MainActivity$1.class
	bin/classes/com/example/milestone/MainActivity$6.class
	bin/classes/com/example/milestone/MainActivity.class
test