Merge branch 'master' into mac
Test
Merge branch 'master' into mac
tett
Merge branch 'master' into mac

Conflicts:
	CMDSim.pro.user
	CMDSim.pro.user.
	dlglchset.cpp
ss
Merge branch 'master' into mac
add insert row
Merge branch 'mac'