change getNearShops etc.
fix getNearShops
merge #55
aaaa
Merge branch 'master' into kikuranch4

Conflicts:
	PosterGirl/PosterGirlService.aar
fix getNearShops()
fix RegistShop.html regitShop.js getNearShop() index.html PosterGirlService.java
Merge pull request #56 from CloudSpiral/kikuranch5

Kikuranch5