Cities filter
Merge branch 'ranko'

Conflicts:
	app/src/main/java/com/nas2skupa/do12/Akcije.java