dev merge

fixed hero swapping and made some progress on ai navigation