Fixed guerrilla missions
Changes to mergefile
mergefix
Merge branch 'Marius'