celaning
Merge branch 'master' of https://github.com/machpavel/autickax

Conflicts:
	Auticka/src/cz/mff/cuni/autickax/pathway/DistanceMap.java
server version of file. i dont know how to revert it