k
Merge branch 'Data' of github.com:hbnn/Python_PYQT into Data

Conflicts:
	My_module/Data_base/editdialog.py
	My_module/Data_base/lina.db