added correct
Merge branch 'master' of https://github.com/Kyoheitnav/FloodAR

Conflicts:
	src/jp/itnav/r4r/ardrill/LocationResult.java