Added Gareth's local stuff before the laser fix
Merge branch 'Grid_Main' of https://github.com/lucasz93/source-sdk-2013 into Grid_Main

Conflicts:
	sp/src/game/server/grid/grid_base_weapon.cpp
fixed bug with laser
Merge branch 'Grid_Main' of https://github.com/lucasz93/source-sdk-2013 into Grid_Main