mini popravki
Merge branch 'master' of https://github.com/snooze77/android.git

Conflicts:
	res/layout/activity_dogodki.xml
zadnji popravki