Sync up for preparing to merge (MouseLook Disabled for fixing)

Right guys this is my sync up for the merging of branches to put all
this together (Mouselook needs fixed)