drugi nesamostalni commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	Dugmici/src/com/example/locafun/AddRemindersActivity.java