klaradi programmers imagePath dullid
Merge branch 'master' of https://github.com/DORB/Verkur3GUI

Conflicts:
	addprogrammerdialog.cpp
	addprogrammerdialog.h

	modified:   Models/computer.cpp
	modified:   Models/computer.h
	modified:   Repos/computerrepository.cpp
	modified:   addcomputerdialog.cpp
	modified:   addcomputerdialog.h
	modified:   addcomputerdialog.ui
	modified:   addprogrammerdialog.cpp
	modified:   addprogrammerdialog.h
	modified:   addprogrammerdialog.ui
	modified:   mainwindow.cpp
	modified:   mainwindow.h
	modified:   mainwindow.ui
	modified:   utilities.cpp
	modified:   utilities.h
imagePath i programmers komid...
Merge branch 'master' of https://github.com/DORB/Verkur3GUI