kategori Controller
Merge remote-tracking branch 'origin/master'

Conflicts:
	TCMSProject/TCMSProject.v12.suo
	TCMSProject/TCMSProject/bin/TCMSProject.dll
	TCMSProject/TCMSProject/bin/TCMSProject.pdb
	TCMSProject/TCMSProject/bin/tcmsDAL.dll
	TCMSProject/TCMSProject/bin/tcmsDAL.pdb

	TCMSProject/TCMSProject/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache

	TCMSProject/TCMSProject/obj/Debug/TCMS.Web.csprojResolveAssemblyReference.cache
	TCMSProject/TCMSProject/obj/Debug/TCMSProject.dll
	TCMSProject/TCMSProject/obj/Debug/TCMSProject.pdb
	TCMSProject/tcmsDAL/bin/Debug/tcmsDAL.dll
	TCMSProject/tcmsDAL/bin/Debug/tcmsDAL.pdb

	TCMSProject/tcmsDAL/obj/Debug/TCMS.Dal.csprojResolveAssemblyReference.cache
	TCMSProject/tcmsDAL/obj/Debug/tcmsDAL.dll
	TCMSProject/tcmsDAL/obj/Debug/tcmsDAL.pdb