Merge branch 'master' of https://github.com/AlexHayton/UnityTestProject2 into Rami
Merge branch 'master' of https://github.com/AlexHayton/UnityTestProject2 into Rami
Merge branch 'alex' of https://github.com/AlexHayton/UnityTestProject2 into Rami
Added transparent glass
Bind the head crab textures
-added placeholder icons for weapons
Merge branch 'refs/heads/Rami' into alex
Tweaks
Bah. Laser's still not working
Slight bullet/weapon tweaks.  Adds drainable container.
Merge branch 'alex' of https://github.com/AlexHayton/UnityTestProject2 into alex
Fixed laser orientation (was spawning with Quaternion.Identity)
Merge remote-tracking branch 'origin/alex' into JimWest