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

Conflicts:
	actions.php
hr
Merge branch 'master' of https://github.com/fden/taxi

Conflicts:
	actions.php
	raport_test.php
raport