fixed mp captive, surrender bug, fixed #658
Merge branch 'master' of https://github.com/KoffeinFlummi/AGM