Gamedevbranch

Figured I might as well merge these in...