Edit list view and map view
Merge branch 'master' of https://github.com/VNiOS/ARShop

Conflicts:
	ARShop/ARShop.xcodeproj/project.xcworkspace/xcuserdata/Applehouse.xcuserdatad/UserInterfaceState.xcuserstate
	ARShop/BeNCListViewController.m
	ARShop/BeNCMapViewController.m