no message
Merge branch 'master' of https://github.com/lukacvetkovic/SamoBus

Conflicts:
	app/src/main/java/cvim/hr/samobus/MainActivity.java