android project structure
Merge branch 'master' into development
added local.properties