Reordered headers
Modified library loading
Fixed derp
Made the build directories more logical
Merge branch 'develop' into feature/box2d
Add fixed rotation to rigidbody
Add density and friction functions to rigidbody
Merge branch 'feature/box2d' into develop
Merge remote-tracking branch 'origin/develop' into Android

Conflicts:
	vs2010/TestProject/source/TestScene.cpp
android scene