Physics data

Physics internal data is shown, as well as collisions.
Merge remote-tracking branch 'origin/master' into josh-to-merge

Conflicts:
	Assets/AssetMgmt_data/thumbnails/BillboardAtlas_Diffuse_8e9f4fed.jpg
	Assets/AssetMgmt_data/thumbnails/BillboardAtlas_Normal_7712c887.jpg
	Assets/AssetMgmt_data/thumbnails/ButtonQuit_MouseOver_d0b53534.jpg
	Assets/AssetMgmt_data/thumbnails/ButtonQuit_Normal_f9c83960.jpg
	Assets/AssetMgmt_data/thumbnails/Button_38cf6edc.jpg
	Assets/AssetMgmt_data/thumbnails/CharHeight_7d2ed732.jpg
	Assets/AssetMgmt_data/thumbnails/Cube_f4e6fea1.jpg
	Assets/AssetMgmt_data/thumbnails/DialogFrame_blue_03eb7640.jpg
	Assets/AssetMgmt_data/thumbnails/Edit_50c7066f.jpg
	Assets/AssetMgmt_data/thumbnails/FGrass01_e267016b.jpg
	Assets/AssetMgmt_data/thumbnails/Frame_874dd52b.jpg
	Assets/AssetMgmt_data/thumbnails/GroundFog_932b2b44.jpg
	Assets/AssetMgmt_data/thumbnails/Hair_cmap_14057799.jpg
	Assets/AssetMgmt_data/thumbnails/Hair_cmap_9e58b02a.jpg
	Assets/AssetMgmt_data/thumbnails/Hair_nmap_ad114bdc.jpg
	Assets/AssetMgmt_data/thumbnails/Hair_smap_a697f031.jpg
	Assets/AssetMgmt_data/thumbnails/Media_stop_16992a51.jpg
	Assets/AssetMgmt_data/thumbnails/MouseCrossAdd_0af2ca1d.jpg
	Assets/AssetMgmt_data/thumbnails/MouseCross_a1d5edbe.jpg
	Assets/AssetMgmt_data/thumbnails/MouseMove_2830da0d.jpg
	Assets/AssetMgmt_data/thumbnails/Plane2_752becb1.jpg
	Assets/AssetMgmt_data/thumbnails/Plane_992f31bb.jpg
	Assets/AssetMgmt_data/thumbnails/Plane_add7a6db.jpg
	Assets/AssetMgmt_data/thumbnails/Point_999ca7eb.jpg
	Assets/AssetMgmt_data/thumbnails/Sphere_c8a5c9fa.jpg
	Assets/AssetMgmt_data/thumbnails/TorchBottom_693dc7ab.jpg
	Assets/AssetMgmt_data/thumbnails/Torch_9202e52d.jpg
	Assets/AssetMgmt_data/thumbnails/Torus_c352ff41.jpg
	Assets/AssetMgmt_data/thumbnails/WarriorEvents_54c5c6b5.jpg
	Assets/AssetMgmt_data/thumbnails/Warrior_85c6b3ca.jpg
	Assets/AssetMgmt_data/thumbnails/ammo_back_3c514f06.jpg
	Assets/AssetMgmt_data/thumbnails/blubber_97a80cab.jpg
	Assets/AssetMgmt_data/thumbnails/blubber_small_bebb4df8.jpg
	Assets/AssetMgmt_data/thumbnails/crosshair_b068b932.jpg
	Assets/AssetMgmt_data/thumbnails/crouching_0bc2cb97.jpg
	Assets/AssetMgmt_data/thumbnails/explosion_page_8a6617f4.jpg
	Assets/AssetMgmt_data/thumbnails/explosion_page_cc6665ed.jpg
	Assets/AssetMgmt_data/thumbnails/grass_alpha_01_be5a8a3f.jpg
	Assets/AssetMgmt_data/thumbnails/machinegun_fdb6ef01.jpg
	Assets/AssetMgmt_data/thumbnails/mgun_hole_b57d1459.jpg
	Assets/AssetMgmt_data/thumbnails/sliderHigh_45bfb97a.jpg
	Assets/AssetMgmt_data/thumbnails/sliderHigh_c52a4afd.jpg
	Assets/AssetMgmt_data/thumbnails/sliderNorm_c0dabfb7.jpg
	Assets/AssetMgmt_data/thumbnails/sliderNorm_dcea8619.jpg
	Assets/AssetMgmt_data/thumbnails/smoke_d02afdb1.jpg
	Assets/AssetMgmt_data/thumbnails/sniper_scope_103f3699.jpg
	Assets/AssetMgmt_data/thumbnails/standing_a11b443d.jpg
	Assets/AssetMgmt_data/thumbnails/steam_e6acac64.jpg
	Assets/AssetMgmt_data/thumbnails/wallmarksmoke_a70c5d85.jpg
	Assets/AssetMgmt_data/thumbnails/warrior_cmap-2k_0a7537e9.jpg
	Assets/AssetMgmt_data/thumbnails/warrior_nmap-2k_adf01d1a.jpg
	Assets/AssetMgmt_data/thumbnails/warrior_smap-2k_92ccf510.jpg
	Source/GameApplication/GravityRoomController.h
	Source/GameApplication/Main.cpp
	Source/GameApplication/ProjectTemplateDX9_win32_vs2010.vcxproj
	Source/GameApplication/ProjectTemplateDX9_win32_vs2010.vcxproj.filters
	Source/GameApplication/ProjectTemplate_Android_vs2010.vcxproj
	Source/GameApplication/ProjectTemplate_Android_vs2010.vcxproj.filters