new version
Merge remote-tracking branch 'origin/master' into Mati_anketa

Conflicts:
	mainwindow.cpp
	mainwindow.h
Merge pull request #1 from Veers/Mati_anketa

Mati anketa