Iš bazės kompo
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/com/miesto/meniu/ItemScreen.java
	app/src/main/java/com/miesto/meniu/MainActivity.java