Merge remote-tracking branch 'origin/AdamBranch'

Conflicts:
	Scripts/AOS.Common.js
fixed merge issues
Added Knockout Libraries
new assets
input style update
login changes
Merge remote-tracking branch 'origin/master' into AdamBranch

Conflicts:
	CZAOS/CZAOSCore/bin/Debug/CZAOSCore.dll
	CZAOS/CZAOSCore/bin/Debug/CZAOSCore.pdb
	CZAOS/CZAOSCore/obj/Debug/CZAOSCore.csproj.FileListAbsolute.txt
	CZAOS/CZAOSCore/obj/Debug/CZAOSCore.csprojResolveAssemblyReference.cache
	CZAOS/CZAOSCore/obj/Debug/CZAOSCore.dll
	CZAOS/CZAOSCore/obj/Debug/CZAOSCore.pdb
	CZAOS/CZAOSCore/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	CZAOS/CZAOSMail/bin/Debug/CZAOSCore.dll
	CZAOS/CZAOSMail/bin/Debug/CZAOSCore.pdb
	CZAOS/CZAOSMail/bin/Debug/CZAOSMail.dll
	CZAOS/CZAOSMail/bin/Debug/CZAOSMail.pdb
	CZAOS/CZAOSMail/bin/Debug/CZBizObjects.dll
	CZAOS/CZAOSMail/bin/Debug/CZBizObjects.pdb
	CZAOS/CZAOSMail/bin/Debug/CZDataObjects.dll
	CZAOS/CZAOSMail/bin/Debug/CZDataObjects.pdb
	CZAOS/CZAOSMail/obj/Debug/CZAOSMail.csproj.FileListAbsolute.txt
	CZAOS/CZAOSMail/obj/Debug/CZAOSMail.csprojResolveAssemblyReference.cache
	CZAOS/CZAOSMail/obj/Debug/CZAOSMail.dll
	CZAOS/CZAOSMail/obj/Debug/CZAOSMail.pdb
	CZAOS/CZAOSMail/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	CZAOS/CZAOSWeb/bin/CZAOSCore.dll
	CZAOS/CZAOSWeb/bin/CZAOSCore.pdb
	CZAOS/CZAOSWeb/bin/CZAOSMail.dll
	CZAOS/CZAOSWeb/bin/CZAOSMail.pdb
	CZAOS/CZAOSWeb/bin/CZAOSWeb.dll
	CZAOS/CZAOSWeb/bin/CZAOSWeb.pdb
	CZAOS/CZAOSWeb/bin/CZBizObjects.dll
	CZAOS/CZAOSWeb/bin/CZBizObjects.pdb
	CZAOS/CZAOSWeb/bin/CZDataObjects.dll
	CZAOS/CZAOSWeb/bin/CZDataObjects.pdb
	CZAOS/CZAOSWeb/obj/Debug/CZAOSWeb.csproj.FileListAbsolute.txt
	CZAOS/CZAOSWeb/obj/Debug/CZAOSWeb.csprojResolveAssemblyReference.cache
	CZAOS/CZAOSWeb/obj/Debug/CZAOSWeb.dll
	CZAOS/CZAOSWeb/obj/Debug/CZAOSWeb.pdb
	CZAOS/CZAOSWeb/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	CZAOS/CZBizObjects/bin/Debug/CZAOSCore.dll
	CZAOS/CZBizObjects/bin/Debug/CZAOSCore.pdb
	CZAOS/CZBizObjects/bin/Debug/CZBizObjects.dll
	CZAOS/CZBizObjects/bin/Debug/CZBizObjects.pdb
	CZAOS/CZBizObjects/bin/Debug/CZDataObjects.dll
	CZAOS/CZBizObjects/bin/Debug/CZDataObjects.pdb
	CZAOS/CZBizObjects/obj/Debug/CZBizObjects.csproj.FileListAbsolute.txt
	CZAOS/CZBizObjects/obj/Debug/CZBizObjects.csprojResolveAssemblyReference.cache
	CZAOS/CZBizObjects/obj/Debug/CZBizObjects.dll
	CZAOS/CZBizObjects/obj/Debug/CZBizObjects.pdb
	CZAOS/CZBizObjects/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	CZAOS/CZDataObjects/bin/Debug/CZAOSCore.dll
	CZAOS/CZDataObjects/bin/Debug/CZAOSCore.pdb
	CZAOS/CZDataObjects/bin/Debug/CZDataObjects.dll
	CZAOS/CZDataObjects/bin/Debug/CZDataObjects.pdb
	CZAOS/CZDataObjects/obj/Debug/CZDataObjects.csproj.FileListAbsolute.txt
	CZAOS/CZDataObjects/obj/Debug/CZDataObjects.csprojResolveAssemblyReference.cache
	CZAOS/CZDataObjects/obj/Debug/CZDataObjects.dll
	CZAOS/CZDataObjects/obj/Debug/CZDataObjects.pdb
	CZAOS/CZDataObjects/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	Scripts/AOS.Common.js

fixing merge issues