30082014#2
Merge branch 'master' of https://github.com/paradorn/AWMS

Conflicts:
	AOneLertInventoryApp/InventoryManagerApp.Database/bin/Debug/ApplicationSchema.dacpac
	AOneLertInventoryApp/InventoryManagerApp.Database/bin/Debug/InventoryManagerApp.Database.dacpac
	AOneLertInventoryApp/InventoryManagerApp.Database/obj/Debug/InventoryManagerApp.Database.sqlproj.FileListAbsolute.txt
	AOneLertInventoryApp/InventoryManagerApp/InventoryManagerApp.DesktopClient/Bin/Debug/Config.xml
	AOneLertInventoryApp/InventoryManagerApp/InventoryManagerApp.DesktopClient/Bin/Debug/InventoryManagerApp.DesktopClient.dll
	AOneLertInventoryApp/InventoryManagerApp/InventoryManagerApp.DesktopClient/Bin/Debug/InventoryManagerApp.DesktopClient.pdb
	AOneLertInventoryApp/InventoryManagerApp/InventoryManagerApp.DesktopClient/Bin/Debug/InventoryManagerApp.DesktopClient.xap
	AOneLertInventoryApp/InventoryManagerApp/InventoryManagerApp.DesktopClient/Bin/Debug/ServiceMetadataFiles.txt
	AOneLertInventoryApp/InventoryManagerApp/InventoryManagerApp.DesktopClient/Bin/Debug/XapCache.tmp
	AOneLertInventoryApp/InventoryManagerApp/InventoryManagerApp.DesktopClient/GeneratedArtifacts/ApplicationData.csdl
	AOneLertInventoryApp/InventoryManagerApp/InventoryManagerApp.DesktopClient/GeneratedArtifacts/ApplicationDataObjectContext.cs
	AOneLertInventoryApp/InventoryManagerApp/InventoryManagerApp.DesktopClient/GeneratedArtifacts/ClientRuntime.lsml
	AOneLertInventoryApp/InventoryManagerApp/InventoryManagerApp.DesktopClient/GeneratedArtifacts/DataClientImplementation.cs
	AOneLertInventoryApp/InventoryManagerApp/InventoryManagerApp.DesktopClient/GeneratedArtifacts/DataRuntime.cs
	AOneLertInventoryApp/InventoryManagerApp/InventoryManagerApp.DesktopClient/GeneratedArtifacts/EntityG15.cs
	AOneLertInventoryApp/InventoryManagerApp/InventoryManagerApp.DesktopClient/GeneratedArtifacts/EntityG16.cs
	AOneLertInventoryApp/InventoryManagerApp/InventoryManagerApp.DesktopClient/GeneratedArtifacts/EntityG17.cs
	AOneLertInventoryApp/InventoryManagerApp/InventoryManagerApp.DesktopClient/GeneratedArtifacts/EntityG18.cs
	AOneLertInventoryApp/InventoryManagerApp/InventoryManagerApp.DesktopClient/GeneratedArtifacts/EntityG19.cs
	AOneLertInventoryApp/InventoryManagerApp/InventoryManagerApp.DesktopClient/GeneratedArtifacts/EntityG20.cs
	AOneLertInventoryApp/InventoryManagerApp/InventoryManagerApp.DesktopClient/GeneratedArtifacts/LSCodeGeneratedFiles.lsgen
	AOneLertInventoryApp/InventoryManagerApp/InventoryManagerApp.HTMLClient/GeneratedArtifacts/data.intellisense.js
	AOneLertInventoryApp/InventoryManagerApp/InventoryManagerApp.HTMLClient/GeneratedArtifacts/data.js
	AOneLertInventoryApp/InventoryManagerApp/InventoryManagerApp.HTMLClient/GeneratedArtifacts/model.json
	AOneLertInventoryApp/InventoryManagerApp/InventoryManagerApp.HTMLClient/GeneratedArtifacts/usercode.js
	AOneLertInventoryApp/InventoryManagerApp/InventoryManagerApp.HTMLClient/GeneratedArtifacts/viewModel.intellisense.js
	AOneLertInventoryApp/InventoryManagerApp/InventoryManagerApp.HTMLClient/GeneratedArtifacts/viewModel.js
	AOneLertInventoryApp/InventoryManagerApp/InventoryManagerApp.Server/DataSources/ApplicationData/RequisitionsSet.lsml
	AOneLertInventoryApp/InventoryManagerApp/InventoryManagerApp.Server/GeneratedArtifacts/ApplicationData.csdl
	AOneLertInventoryApp/InventoryManagerApp/InventoryManagerApp.Server/GeneratedArtifacts/ApplicationData.msl
	AOneLertInventoryApp/InventoryManagerApp/InventoryManagerApp.Server/GeneratedArtifacts/ApplicationData.ssdl
	AOneLertInventoryApp/InventoryManagerApp/InventoryManagerApp.Server/GeneratedArtifacts/ApplicationDataObjectContext.cs
	AOneLertInventoryApp/InventoryManagerApp/InventoryManagerApp.Server/GeneratedArtifacts/DataRuntime.cs
	AOneLertInventoryApp/InventoryManagerApp/InventoryManagerApp.Server/GeneratedArtifacts/DataService.cs
	AOneLertInventoryApp/InventoryManagerApp/InventoryManagerApp.Server/GeneratedArtifacts/DataServiceImplementation.cs
	AOneLertInventoryApp/InventoryManagerApp/InventoryManagerApp.Server/GeneratedArtifacts/EntityG15.cs
	AOneLertInventoryApp/InventoryManagerApp/InventoryManagerApp.Server/GeneratedArtifacts/EntityG16.cs
	AOneLertInventoryApp/InventoryManagerApp/InventoryManagerApp.Server/GeneratedArtifacts/EntityG17.cs
	AOneLertInventoryApp/InventoryManagerApp/InventoryManagerApp.Server/GeneratedArtifacts/EntityG18.cs
	AOneLertInventoryApp/InventoryManagerApp/InventoryManagerApp.Server/GeneratedArtifacts/EntityG19.cs
	AOneLertInventoryApp/InventoryManagerApp/InventoryManagerApp.Server/GeneratedArtifacts/EntityG20.cs
	AOneLertInventoryApp/InventoryManagerApp/InventoryManagerApp.Server/GeneratedArtifacts/LSCodeGeneratedFiles.lsgen
	AOneLertInventoryApp/InventoryManagerApp/InventoryManagerApp.Server/bin/Debug/Application.Server.dll
	AOneLertInventoryApp/InventoryManagerApp/InventoryManagerApp.Server/bin/Debug/Application.Server.pdb
	AOneLertInventoryApp/InventoryManagerApp/InventoryManagerApp.Server/obj/Debug/Application.Server.dll
	AOneLertInventoryApp/InventoryManagerApp/InventoryManagerApp.Server/obj/Debug/Application.Server.pdb
	AOneLertInventoryApp/InventoryManagerApp/bin/Data/ApplicationSchema.dacpac
	AOneLertInventoryApp/InventoryManagerApp/bin/Debug/DesktopClient/web/InventoryManagerApp.DesktopClient.xap
	AOneLertInventoryApp/InventoryManagerApp/bin/Debug/HTMLClient/Content/Resources/Generated/model.json
	AOneLertInventoryApp/InventoryManagerApp/bin/Debug/HTMLClient/Scripts/Generated/data.js
	AOneLertInventoryApp/InventoryManagerApp/bin/Debug/HTMLClient/Scripts/Generated/usercode.js
	AOneLertInventoryApp/InventoryManagerApp/bin/Debug/HTMLClient/Scripts/Generated/viewModel.js
	AOneLertInventoryApp/InventoryManagerApp/bin/Debug/InventoryManagerApp.lsxproj.FileListAbsolute.txt
	AOneLertInventoryApp/InventoryManagerApp/bin/Debug/bin/Application.Server.dll
Merge branch 'master' of https://github.com/paradorn/AWMS

Conflicts:
	AOneLertInventoryApp/InventoryManagerApp.Database/InventoryManagerApp.Database_Bck.dbmdl
	AOneLertInventoryApp/InventoryManagerApp/InventoryManagerApp.DesktopClient/Bin/Debug/LSClientCodeGeneratorsTask.mcs
	AOneLertInventoryApp/InventoryManagerApp/InventoryManagerApp.DesktopClient/Bin/Debug/LSResourceGeneratorsTask.mcs
	AOneLertInventoryApp/InventoryManagerApp/InventoryManagerApp.HTMLClient/bin/LSClientCodeGeneratorsTask.mcs
	AOneLertInventoryApp/InventoryManagerApp/InventoryManagerApp.HTMLClient/bin/LSResourceGeneratorsTask.mcs
	AOneLertInventoryApp/InventoryManagerApp/InventoryManagerApp.Server/bin/Debug/LSResourceGeneratorsTask.mcs
	AOneLertInventoryApp/InventoryManagerApp/InventoryManagerApp.Server/bin/Debug/LSServerCodeGeneratorsTask.mcs
	AOneLertInventoryApp/InventoryManagerApp/InventoryManagerApp.Server/bin/Debug/LSSvcGeneratorsTask.mcs