Fixed Android project configuration
Merge branch 'master' into develop
Fixed configuration on develop branch