Merge branch 'master' into development

Conflicts:
	android/BeyondAR_Framework/src/com/beyondar/android/view/CameraView.java