現状UP
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/R.txt
	bin/SolitonRadarProject.apk
	bin/classes.dex
	bin/classes/com/example/solitonradar/R$drawable.class
	bin/res/crunch/drawable/circle.png
	bin/resources.ap_
	gen/com/example/solitonradar/R.java
	src/com/example/solitonradar/MakeMap.java
	src/com/example/solitonradar/Task.java