ny rev
Merge remote-tracking branch 'origin/master'

Conflicts:
	Assets/Models/Weapon.meta
	Assets/Models/Weapon/Handgun.mb.meta
	Assets/Models/Weapon/Magazine.mb.meta
	Assets/Models/Weapon/Materials.meta
	Assets/Models/Weapon/Materials/lambert1.mat.meta
	Assets/Models/Weapon/Materials/phong2.mat.meta
	Assets/Models/Weapon/Weapon.apf.meta
	Assets/Models/Weapon/Weapon.mb.meta
	Library/CurrentLayout.dwlt
	Library/assetDatabase3
	Library/expandedItems
	Library/guidmapper
	Library/metadata/61/617933801f5d4cd468ccd807c5a89533
	Library/metadata/e8/e81c971ceaecb0e46b64d83f3dc08f45
	Library/shadercompiler-1.log
Kveldsnerd