update
premerge
Merge branch 'master' of https://github.com/HydroSurge/KopsControl

Conflicts:
	Assembly-CSharp.pidb
	Assembly-UnityScript.pidb
	Assets/Assets_Jaime/scripts.meta
	Assets/Assets_Jaime/scripts/GameUpdate.js.meta
	Assets/Assets_Jaime/scripts/Global.js.meta
	Assets/Assets_Jaime/scripts/ObjectProcessor.js.meta
	Assets/Assets_Kuba/MetaTute/Finished/Models/Materials/lambert1.mat
	Assets/Assets_Kuba/MetaTute/Finished/Models/Materials/lambert1.mat.meta
	Assets/Assets_Kuba/MetaTute/Finished/Models/Materials/mat_metalCorrugated_var01.mat
	Assets/Assets_Kuba/MetaTute/Finished/Models/Materials/mat_metalCorrugated_var01.mat.meta
	Assets/Assets_Kuba/MetaTute/Finished/Models/Materials/mat_metalCorrugated_var01_VRT.mat
	Assets/Assets_Kuba/MetaTute/Finished/Models/Materials/mat_metalCorrugated_var01_VRT.mat.meta
	Assets/Assets_Kuba/MetaTute/Finished/Models/Materials/mat_metalCorrugated_var02.mat
	Assets/Assets_Kuba/MetaTute/Finished/Models/Materials/mat_metalCorrugated_var02.mat.meta
	Assets/Assets_Kuba/MetaTute/Finished/Models/Materials/mat_metalCorrugated_var03.mat
	Assets/Assets_Kuba/MetaTute/Finished/Models/Materials/mat_metalCorrugated_var03.mat.meta
	Assets/Assets_Kuba/MetaTute/Finished/Models/Materials/mat_propContainer_var01.mat
	Assets/Assets_Kuba/MetaTute/Finished/Models/Materials/mat_propContainer_var01.mat.meta
	Assets/Assets_Kuba/MetaTute/Finished/Models/Materials/mat_propContainer_var02.mat
	Assets/Assets_Kuba/MetaTute/Finished/Models/Materials/mat_propContainer_var02.mat.meta
	Assets/Assets_Kuba/MetaTute/Finished/Models/Materials/mat_propContainer_var03.mat
	Assets/Assets_Kuba/MetaTute/Finished/Models/Materials/mat_propContainer_var03.mat.meta
	Assets/Assets_Kuba/MetaTute/Finished/Models/Materials/mat_propCrate1.mat
	Assets/Assets_Kuba/MetaTute/Finished/Models/Materials/mat_propCrate1.mat.meta
	Assets/Assets_Kuba/MetaTute/Finished/Models/Materials/mat_propScaffJoint.mat
	Assets/Assets_Kuba/MetaTute/Finished/Models/Materials/mat_propScaffJoint.mat.meta
	Assets/Assets_Kuba/MetaTute/Finished/Models/Materials/mat_tileConcreteFloor_var01.mat
	Assets/Assets_Kuba/MetaTute/Finished/Models/Materials/mat_tileConcreteFloor_var01.mat.meta
	Assets/Assets_Kuba/MetaTute/Finished/Models/Materials/mat_tileConcreteFloor_var02.mat
	Assets/Assets_Kuba/MetaTute/Finished/Models/Materials/mat_tileConcreteFloor_var02.mat.meta
	Assets/Assets_Kuba/MetaTute/Finished/Models/Materials/mat_tileMetalGalvanized.mat
	Assets/Assets_Kuba/MetaTute/Finished/Models/Materials/mat_tileMetalGalvanized.mat.meta
	Assets/Assets_Kuba/MetaTute/Finished/Models/Materials/mat_tilePlywood_var01.mat
	Assets/Assets_Kuba/MetaTute/Finished/Models/Materials/mat_tilePlywood_var01.mat.meta
	Assets/Assets_Kuba/MetaTute/Finished/Models/Materials/mat_tilePlywood_var02.mat
	Assets/Assets_Kuba/MetaTute/Finished/Models/Materials/mat_tilePlywood_var02.mat.meta
	Assets/Assets_Kuba/MetaTute/Finished/Models/Materials/mat_tilePlywood_var03.mat
	Assets/Assets_Kuba/MetaTute/Finished/Models/Materials/mat_tilePlywood_var03.mat.meta
	Assets/Assets_Kuba/MetaTute/Finished/Models/Materials/mat_tilePlywood_var04.mat
	Assets/Assets_Kuba/MetaTute/Finished/Models/Materials/mat_tilePlywood_var04.mat.meta
	Assets/Assets_Kuba/MetaTute/Finished/Models/Materials/mat_tileWood_rough.mat
	Assets/Assets_Kuba/MetaTute/Finished/Models/Materials/mat_tileWood_rough.mat.meta
	Assets/Assets_Kuba/MetaTute/Finished/Models/Materials/mat_tile_metalGalvanized.mat
	Assets/Assets_Kuba/MetaTute/Finished/Models/Materials/mat_tile_metalGalvanized.mat.meta
	Assets/Assets_Kuba/MetaTute/Finished/Models/Materials/mat_tile_plywood_var01.mat
	Assets/Assets_Kuba/MetaTute/Finished/Models/Materials/mat_tile_plywood_var01.mat.meta
	Assets/Assets_Kuba/MetaTute/Finished/Models/Materials/mat_tile_plywood_var02.mat
	Assets/Assets_Kuba/MetaTute/Finished/Models/Materials/mat_tile_plywood_var02.mat.meta
	Assets/Assets_Kuba/MetaTute/Finished/Models/Materials/mat_tile_plywood_var03.mat
	Assets/Assets_Kuba/MetaTute/Finished/Models/Materials/mat_tile_plywood_var03.mat.meta
	Assets/Assets_Kuba/MetaTute/Finished/Models/Materials/mat_tile_plywood_var04.mat
	Assets/Assets_Kuba/MetaTute/Finished/Models/Materials/mat_tile_plywood_var04.mat.meta
	Assets/Assets_Kuba/MetaTute/Finished/Models/Materials/pickupCentre_DFF.mat
	Assets/Assets_Kuba/MetaTute/Finished/Models/Materials/pickupCentre_DFF.mat.meta
	Assets/Assets_Kuba/MetaTute/Finished/Models/Materials/propCrate_DFF.mat
	Assets/Assets_Kuba/MetaTute/Finished/Models/Materials/propCrate_DFF.mat.meta
	Assets/Assets_Kuba/MetaTute/Finished/Models/Materials/propHurdle_DFF.mat
	Assets/Assets_Kuba/MetaTute/Finished/Models/Materials/propHurdle_DFF.mat.meta
	Assets/Assets_Kuba/MetaTute/Finished/Models/Materials/propScaffJoint_DFF.mat
	Assets/Assets_Kuba/MetaTute/Finished/Models/Materials/propScaffJoint_DFF.mat.meta
	Assets/Assets_Kuba/MetaTute/Finished/Models/Materials/prop_samoflange_dff.mat
	Assets/Assets_Kuba/MetaTute/Finished/Models/Materials/prop_samoflange_dff.mat.meta
	Assets/Assets_Kuba/MetaTute/Finished/Models/Materials/propcontainer_var01_DFF.mat
	Assets/Assets_Kuba/MetaTute/Finished/Models/Materials/propcontainer_var01_DFF.mat.meta
	Assets/Assets_Kuba/MetaTute/Finished/Models/Materials/swatchGreyDark_DFF.mat
	Assets/Assets_Kuba/MetaTute/Finished/Models/Materials/swatchGreyDark_DFF.mat.meta
	Assets/Assets_Kuba/MetaTute/Finished/Models/Materials/tileMetalGavanised_DFF.mat
	Assets/Assets_Kuba/MetaTute/Finished/Models/Materials/tileMetalGavanised_DFF.mat.meta
	Assets/Assets_Kuba/TestHarryController.controller
	Assets/Assets_Martin/GamePlayScene_Martin.unity
	Assets/Assets_Martin/Scripts/pump.js
	KopsControl.userprefs