Merge branch 'master' of github.com:qriver/Structbase-Source
Merge branch 'master' of github.com:qriver/Structbase-Source

Conflicts:
	SystemManager/prjSystemManage.dpr
	WebRun/Webapp_Iphone/PrjWebApp_IPhone.dpr
	WebRun/Webapp_Iphone/PrjWebApp_IPhone.dproj
	WebRun/Webapp_Iphone/unit/uMainForm.dfm
	WebRun/Webapp_Iphone/unit/uMainForm.pas