New android project
Merge branch 'master' into develop