Merge remote-tracking branch 'SmartFIS/master'
Merge remote-tracking branch 'SmartFIS/master'
Merge remote-tracking branch 'SmartFIS/master'

Conflicts:
	DDDWebSiteProject/DDDWebSiteProject.suo
DataBlock deletion added