Merge remote-tracking branch 'origin/123' into wsq

Conflicts:
	Business/Config/IOC.xml
	Poco/_B_SystemConst.cs