views and enums
Merge branch 'master' of https://github.com/zentix/OBProject

Conflicts:
	OBProject/OBProject.suo
	OBProject/OBProject/Controllers/RequestController.cs
	OBProject/OBProject/DAL/OBModel.edmx
	OBProject/OBProject/OBProject.csproj
	OBProject/OBProject/bin/OBProject.dll
	OBProject/OBProject/bin/OBProject.pdb
	OBProject/OBProject/obj/Debug/DesignTimeResolveAssemblyReferences.cache
	OBProject/OBProject/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	OBProject/OBProject/obj/Debug/OBProject.csprojResolveAssemblyReference.cache
	OBProject/OBProject/obj/Debug/OBProject.dll
	OBProject/OBProject/obj/Debug/OBProject.pdb
	OBProject/OBProject/obj/Debug/TempPE/DAL.OBModel.Designer.cs.dll
	OBProject/OBProject/obj/Debug/edmxResourcesToEmbed/DAL/OBModel.csdl
Merge branch 'master' of https://github.com/zentix/OBProject

Conflicts:
	OBProject/OBProject.suo
	OBProject/OBProject/bin/OBProject.dll
	OBProject/OBProject/bin/OBProject.pdb
	OBProject/OBProject/obj/Debug/DesignTimeResolveAssemblyReferences.cache
	OBProject/OBProject/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	OBProject/OBProject/obj/Debug/OBProject.csproj.FileListAbsolute.txt
	OBProject/OBProject/obj/Debug/OBProject.csprojResolveAssemblyReference.cache
	OBProject/OBProject/obj/Debug/OBProject.dll
	OBProject/OBProject/obj/Debug/OBProject.pdb
	OBProject/OBProject/obj/Debug/TempPE/DAL.OBModel.Designer.cs.dll
	OBProject/OBProject/obj/Debug/edmxResourcesToEmbed/DAL/OBModel.csdl
	OBProject/OBProject/obj/Debug/edmxResourcesToEmbed/DAL/OBModel.msl
	OBProject/OBProject/obj/Debug/edmxResourcesToEmbed/DAL/OBModel.ssdl