王鹏：重新合并下
王鹏：11
1
Merge remote-tracking branch 'origin/MacGrady' into wp

Conflicts:
	.gitignore
	TacroManagement/Projects/TacroManagement/BLL/Affair.cs
	TacroManagement/Projects/TacroManagement/BLL/Project.cs
	TacroManagement/Projects/TacroManagement/BLL/ProjectUser.cs
	TacroManagement/Projects/TacroManagement/DALFactory/DataAccess.cs
	TacroManagement/Projects/TacroManagement/IDAL/IProjectDoc.cs
	TacroManagement/Projects/TacroManagement/Model/ProjectDocInfo.cs
	TacroManagement/Projects/TacroManagement/Model/ProjectInfo.cs
	TacroManagement/Projects/TacroManagement/MySQLDAL/Project.cs
	TacroManagement/Projects/TacroManagement/MySQLDAL/ProjectDoc.cs
	TacroManagement/Projects/TacroManagement/TacroManagement.suo
	TacroManagement/WebSites/TacroManagement/AdvancedSearch.aspx
	TacroManagement/WebSites/TacroManagement/AdvancedSearch.aspx.cs
	TacroManagement/WebSites/TacroManagement/Library/js/flexpaper_flash.js
	TacroManagement/WebSites/TacroManagement/Library/js/flexpaper_flash_debug.js
	TacroManagement/WebSites/TacroManagement/Library/js/jquery.js
	TacroManagement/WebSites/TacroManagement/Library/js/swfobject/swfobject.js
	TacroManagement/WebSites/TacroManagement/css/index.css
	TacroManagement/WebSites/TacroManagement/web.config
	TacroManagement/WebSites/TacroManagement/web/index.aspx
	TacroManagement/WebSites/TacroManagement/web/index.master
Merge branch 'wp' of https://github.com/wp998811/web into wp

Conflicts:
	TacroManagement/Projects/TacroManagement/BLL/Project.cs
	TacroManagement/Projects/TacroManagement/BLL/ProjectUser.cs
	TacroManagement/Projects/TacroManagement/Model/ProjectInfo.cs
	TacroManagement/Projects/TacroManagement/Model/RichSubTaskInfo.cs
	TacroManagement/Projects/TacroManagement/MySQLDAL/Project.cs
	TacroManagement/Projects/TacroManagement/TacroManagement.suo
	TacroManagement/WebSites/TacroManagement/web/HTMLPage.htm
	TacroManagement/WebSites/TacroManagement/web/index.aspx
	TacroManagement/WebSites/TacroManagement/web/index.aspx.cs
	TacroManagement/WebSites/TacroManagement/web/projectInfo.aspx
	TacroManagement/WebSites/TacroManagement/web/projectInfo.aspx.cs
	TacroManagement/WebSites/TacroManagement/web/subTaskModify.aspx
	TacroManagement/WebSites/TacroManagement/web/subTaskModify.aspx.cs
王鹏：解决冲突
Merge remote-tracking branch 'origin/wp' into MacGrady

Conflicts:
	.gitignore
	TacroManagement/Projects/TacroManagement/BLL/Affair.cs
	TacroManagement/Projects/TacroManagement/BLL/BLL.csproj
	TacroManagement/Projects/TacroManagement/BLL/Project.cs
	TacroManagement/Projects/TacroManagement/BLL/ProjectDoc.cs
	TacroManagement/Projects/TacroManagement/BLL/ProjectUser.cs
	TacroManagement/Projects/TacroManagement/BLL/Properties/AssemblyInfo.cs
	TacroManagement/Projects/TacroManagement/DALFactory/DataAccess.cs
	TacroManagement/Projects/TacroManagement/DBUtility/DBUtility.csproj
	TacroManagement/Projects/TacroManagement/IDAL/IDAL.csproj
	TacroManagement/Projects/TacroManagement/IDAL/IProjectDoc.cs
	TacroManagement/Projects/TacroManagement/Model/Model.csproj
	TacroManagement/Projects/TacroManagement/Model/ProjectDocInfo.cs
	TacroManagement/Projects/TacroManagement/Model/ProjectInfo.cs
	TacroManagement/Projects/TacroManagement/Model/RichSubTaskInfo.cs
	TacroManagement/Projects/TacroManagement/MySQLDAL/MySQLDAL.csproj
	TacroManagement/Projects/TacroManagement/MySQLDAL/Project.cs
	TacroManagement/Projects/TacroManagement/MySQLDAL/ProjectDoc.cs
	TacroManagement/Projects/TacroManagement/MySQLDAL/SubTask.cs
	TacroManagement/Projects/TacroManagement/MySQLDAL/User.cs
	TacroManagement/Projects/TacroManagement/TacroManagement.sln
	TacroManagement/Projects/TacroManagement/TacroManagement.suo
	TacroManagement/WebSites/TacroManagement/AdvancedSearch.aspx.cs
	TacroManagement/WebSites/TacroManagement/App_Code/Office2Pdf.cs
	TacroManagement/WebSites/TacroManagement/App_Code/Pdf2Swf.cs
	TacroManagement/WebSites/TacroManagement/Library/File.ashx
	TacroManagement/WebSites/TacroManagement/Library/FileUpload.aspx
	TacroManagement/WebSites/TacroManagement/Library/FileUpload.aspx.cs
	TacroManagement/WebSites/TacroManagement/Library/FileUpload.htm
	TacroManagement/WebSites/TacroManagement/Library/FlexPaperViewer_debug.html
	TacroManagement/WebSites/TacroManagement/Library/ShowLists.aspx
	TacroManagement/WebSites/TacroManagement/Library/ShowLists.aspx.cs
	TacroManagement/WebSites/TacroManagement/Library/TestLibrary.aspx
	TacroManagement/WebSites/TacroManagement/Library/TestLibrary.aspx.cs
	TacroManagement/WebSites/TacroManagement/css/index.css
	TacroManagement/WebSites/TacroManagement/web.config
	TacroManagement/WebSites/TacroManagement/web/HTMLPage.htm
	TacroManagement/WebSites/TacroManagement/web/index.aspx
	TacroManagement/WebSites/TacroManagement/web/index.aspx.cs
	TacroManagement/WebSites/TacroManagement/web/index.master
	TacroManagement/WebSites/TacroManagement/web/projectInfo.aspx
	TacroManagement/WebSites/TacroManagement/web/projectInfo.aspx.cs
	TacroManagement/WebSites/TacroManagement/web/subTaskModify.aspx
	TacroManagement/WebSites/TacroManagement/web/subTaskModify.aspx.cs
	tacro.sql
王杰：合并版本