-
Merge remote-tracking branch 'origin/master'

Conflicts:
	CPPDemo.Lang/CPPDemo.Lang.cbp
	CPPDemo.Lang/CPPDemo.Lang.layout
Merge remote-tracking branch 'origin/master'

Conflicts:
	CPPDemo.Lang/CPPDemo.Lang.cbp
	CPPDemo.Lang/CPPDemo.Lang.layout