tst
commit to tmp
Merge branch 'master' into mac

Conflicts:
	CMDSim.pro.user
	CMDSim.pro.user.
	dlglchset.cpp
ss