yyy
Merge remote-tracking branch 'origin/master'

Conflicts:
	CupolineW/src/main/resources/sdk_config.properties