Merge branch 'refactor_ARViewController'

Conflicts:
EkinakaMap/ARViewController.m

EkinakaMap/EkiNaka.xcworkspace/xcuserdata/ShinnosukeKomiya.xcuserdatad/U
serInterfaceState.xcuserstate