Consolidate headers:
- Group src/common/*.h in src/common/Common.h
- Include all C and C++ standard library headers in q_shared.h
Merge branch 'master' into engine-upgrade/headers
Merge branch 'master' into engine-upgrade/headers

Conflicts:
	src/common/Command.h
	src/common/LineEditData.cpp
	src/common/LineEditData.h
	src/common/String.h
	src/engine/framework/CommandSystem.cpp
	src/engine/framework/CvarSystem.cpp
	src/engine/qcommon/files.cpp
	src/engine/sys/sdl_snd.cpp
Merge branch 'master' into engine-upgrade/headers

Conflicts:
	src/engine/audio/AudioPrivate.h
	src/engine/framework/FileSystem.cpp
	src/engine/rendererGL/tr_animation.cpp
	src/engine/rendererGL/tr_backend.cpp
	src/engine/rendererGL/tr_bsp.cpp
	src/engine/rendererGL/tr_image.cpp
	src/engine/rendererGL/tr_light.cpp
	src/engine/rendererGL/tr_model.cpp
	src/engine/rendererGL/tr_shade.cpp
	src/engine/rendererGL/tr_shade_calc.cpp
	src/engine/sys/sdl_glimp.cpp
Merge branch 'nacl' into engine-upgrade/headers

Conflicts:
	src/common/Command.cpp
	src/common/RPC.h
	src/engine/qcommon/qcommon.h
	src/engine/sys/con_curses.cpp
Fix client build
Remove unused variables and static functions from gamelogic.
Fix type of PDC_bDone
Re-fix stack alignment in pdcurses, which was accidentally overwritten
Don't release the socket handle when creating a native vm
Copy vm.*.type value so that VMBase::Free can work correctly
Fix filesystem handle transfer protocol
Update PDCurses
Fix type of color table in curses console
Add NaCl gdb to external deps
Add vm.<vm>.debugLoader to help understand user's problem with NaCl
Remove ostrinstream, Amanieu doesn't like them
Use sel_ldr64.exe if running as 32-bit in Win64
Fix an error message
Add sel_ldr stderr to the loader log file