Merge branch 'Cole-Bittel'
change to mPosition and mSpawn
Merge branch 'master' into Cole-Bittel