changes
Merge branch 'master' of https://github.com/Icesman/taxi_project.git

Conflicts:
	source/ru/peppers/FreeOrderActivity.java