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

Conflicts:
	bin/classes/com/example/milestone/MainActivity$3.class
	bin/classes/com/example/milestone/MainActivity.class
	src/com/example/milestone/MainActivity.java