changed paths
Merge branch 'master' into JesseMOE

Conflicts:
	FGame/src/OnInit.cpp
Did some testing