ostateczna
Merge branch 'master' of https://github.com/Reggis/projekt_cpp

Conflicts:
	adddialog.h
	admin.cpp
	editdialog.cpp
	mainwindow.cpp
	msg.h
	projekt.pro.user