Merge branch 'master' of https://github.com/kluksa/kontrola-podataka

Conflicts:
	__pycache__/citac.cpython-33.pyc
	__pycache__/weblogger_izbornik.cpython-33.pyc
Merge branch 'master' of https://github.com/kluksa/kontrola-podataka