MakeMapの編集
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/SolitonRadarProject.apk
	bin/classes.dex