Fixed Android project configuration
Merge branch 'master' into develop
Fixed configuration on develop branch
Merge branch 'master' into develop
Added package-info and removed unused constant
Reving Android app version