modified:   connection.cpp
	modified:   connection.h
	modified:   control.cpp
	modified:   currentdata.cpp
	modified:   currentdata.h
	modified:   mainwindow.cpp
Merge commit '82766bf15b114aebfdbaf6d73c2b22a3c5c50403'