Data diagram bug fixed
Merge remote-tracking branch 'SmartFIS/master'

Conflicts:
	DDDModel/BLL/bin/Debug/BLL.dll
	DDDModel/BLL/bin/Debug/BLL.pdb
	DDDModel/BLL/obj/Debug/BLL.dll
	DDDModel/BLL/obj/Debug/BLL.pdb
	DDDModel/DDDModel.suo
	DDDModel/DDDModel/Program.cs
	DDDModel/DDDModel/bin/Debug/BLL.dll
	DDDModel/DDDModel/bin/Debug/BLL.pdb
	DDDModel/DDDModel/bin/Debug/DDDModel.exe
	DDDModel/DDDModel/bin/Debug/DDDModel.pdb
	DDDModel/DDDModel/bin/Debug/FirebirdToMySQLConverter.dll
	DDDModel/DDDModel/bin/Debug/FirebirdToMySQLConverter.pdb
	DDDModel/DDDModel/obj/Debug/DDDModel.exe
	DDDModel/DDDModel/obj/Debug/DDDModel.pdb
	DDDModel/DDDModel/obj/Debug/ResolveAssemblyReference.cache
	DDDModel/FirebirdToMySQLConverter/bin/Debug/BLL.dll
	DDDModel/FirebirdToMySQLConverter/bin/Debug/BLL.pdb
	DDDModel/FirebirdToMySQLConverter/bin/Debug/FirebirdToMySQLConverter.dll
	DDDModel/FirebirdToMySQLConverter/bin/Debug/FirebirdToMySQLConverter.pdb
	DDDModel/FirebirdToMySQLConverter/obj/Debug/FirebirdToMySQLConverter.dll
	DDDModel/FirebirdToMySQLConverter/obj/Debug/FirebirdToMySQLConverter.pdb
	DDDModel/FirebirdToMySQLConverter/obj/Debug/ResolveAssemblyReference.cache
	DDDWebSite/Administrator/Data.aspx.cs
	DDDWebSite/Cachecallback.txt
	DDDWebSiteProject/DDDWebSiteProject.suo