Merge pull request #59 from clintbellanger/master

take latest changes from main project
unblock ally pos on player teleport
Merge pull request #601 from RyanDansie/bug_fixes

unblock ally pos on player teleport