isArFlg
Merge remote-tracking branch 'origin/master'

Conflicts:
	client/bin/classes.dex
	client/bin/classes/com/sw/minavi/activity/GLARActivity.class
	client/bin/classes/com/sw/minavi/activity/TalkActivity.class

	client/bin/classes/com/sw/minavi/item/ARGLSurfaceView$ModelComparator.class

	client/bin/classes/com/sw/minavi/item/ARGLSurfaceView$OpenGLRenderer.class
	client/bin/classes/com/sw/minavi/item/ARGLSurfaceView.class
	client/bin/resources.ap_
	client/src/com/sw/minavi/item/ARGLSurfaceView.java
conflict
Revert "isArFlg"

This reverts commit 1ba1650562cbfbac4a9fbf85b5b3475fb4be035e.

Conflicts:
	client/bin/MinaviAndroidApp.apk
	client/bin/classes/com/sw/minavi/activity/GLARActivity.class

	client/bin/classes/com/sw/minavi/item/ARGLSurfaceView$ModelComparator.class

	client/bin/classes/com/sw/minavi/item/ARGLSurfaceView$OpenGLRenderer.class
	client/bin/classes/com/sw/minavi/item/ARGLSurfaceView.class
	client/bin/resources.ap_