Merge remote-tracking branch 'SmartFIS/master'

Conflicts:
	DDDWebSite/Cachecallback.txt
	DDDWebSiteProject/DDDWebSiteProject.suo
MERGE