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$2.class
	bin/classes/com/example/milestone/MainActivity$3.class
	bin/classes/com/example/milestone/MainActivity$4.class
	bin/classes/com/example/milestone/MainActivity$5.class
	bin/classes/com/example/milestone/MainActivity$6.class
	bin/classes/com/example/milestone/MainActivity$7.class
	bin/classes/com/example/milestone/MainActivity.class
	bin/classes/com/example/milestone/MpService.class
	bin/resources.ap_
	res/layout/activity_control.xml
	src/com/example/milestone/MainActivity.java
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$2.class
	bin/classes/com/example/milestone/MainActivity$3.class
	bin/classes/com/example/milestone/MainActivity$4.class
	bin/classes/com/example/milestone/MainActivity$5.class
	bin/classes/com/example/milestone/MainActivity$6.class
	bin/classes/com/example/milestone/MainActivity$7.class
	bin/classes/com/example/milestone/MainActivity.class
	bin/classes/com/example/milestone/MpService.class
	bin/resources.ap_
	res/layout/activity_control.xml
	src/com/example/milestone/MainActivity.java