Interim changes
Merge branch 'master' of github.com:ssommerfeldt/TAC_EAB

Conflicts:
	Extra/EAB_Custom/EAB_Custom.suo
	Extra/EAB_Custom/EAB_Custom/bin/Release/EAB_Custom.dll
	Extra/EAB_Custom/EAB_Custom/bin/Release/EAB_Custom.pdb
	Extra/EAB_Custom/EAB_Custom/obj/Release/EAB_Custom.dll
	Extra/EAB_Custom/EAB_Custom/obj/Release/EAB_Custom.pdb
	Extra/EAB_Custom/EAB_Custom/obj/Release/ResolveAssemblyReference.cache
	Model/Portal/SlxClient/SupportFiles/Bin/EAB_Custom.dll