changes necessary for publishing to play store
Merge branch 'master' into androidL