mm
Merge remote-tracking branch 'origin/master'

Conflicts:
	AptechManagementUserControl/bin/Release/AptechManagementUserControl.dll
	AptechManagementUserControl/bin/Release/AptechManagementUserControl.pdb

	AptechManagementUserControl/obj/Release/AptechManagementUserControl.csproj.FileListAbsolute.txt

	AptechManagementUserControl/obj/Release/AptechManagementUserControl.csproj.GenerateResource.Cache

	AptechManagementUserControl/obj/Release/AptechManagementUserControl.csprojResolveAssemblyReference.cache
	AptechManagementUserControl/obj/Release/AptechManagementUserControl.dll
	AptechManagementUserControl/obj/Release/AptechManagementUserControl.pdb

	AptechManagementUserControl/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache
	AptechStudebtManagement.v12.suo

	AptechStudebtManagement/obj/Release/AptechStudebtManagement.csproj.FileListAbsolute.txt

	AptechStudebtManagement/obj/Release/DesignTimeResolveAssemblyReferences.cache

	AptechStudebtManagement/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache