syncing
Merge branch 'master' of https://github.com/kepang/Milestone

Conflicts:
	bin/Milestone.apk
	bin/classes/com/example/milestone/MainActivity.class