Merge branch 'develop' of https://github.com/BeyondAR/beyondar into develop
Merge branch 'develop'