Updated to handle the promised courier properly when it is received
Merge branch 'master' of https://github.com/johan-martenson/settlers

Merge with git upstream branch. Only local commit was to handle promised couriers better
Fixed a typo in the previous commit