Merged weapons branch with master
Worked on oarweapons
Fixed texture problems