デモカット2完成
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/SolitonRadarProject.apk
	bin/classes.dex
	src/com/example/solitonradar/MakeMap.java
	src/com/example/solitonradar/Task.java