ihn
Merge branch 'master' of https://github.com/fden/taxi

Conflicts:
	admin.php
poprawki