Pakeisti vardai
Merge branch 'master' of https://github.com/miestomeniu/MiestoMeniu

Conflicts:
	app/src/main/java/com/miesto/meniu/maps.java