[Android] project's setup changes
Merge branch 'master' of https://github.com/kord2003/TestNaviApp

Conflicts:
	project.properties