2014.8.26 GAME replaced CONTENT

big rigs(lol)
Merge remote-tracking branch 'origin/master'

Conflicts:
	maps/template_map.vpk
	scripts/npc/npc_units_custom.txt
	scripts/vscripts/addon_game_mode.lua
	tools_asset_info.bin
	tools_thumbnail_cache.bin