!!
modi ui
modi macros
mac !!
!!
Merge branch 'master' into mac

Conflicts:
	CMDSim.pro
	CMDSim.pro.user
set brd ui
mac me
Merge branch 'master' into mac
rfm debug
Merge branch 'master' into mac
temp comit
Merge branch 'master' into mac

Conflicts:
	CMDSim.pro.user