Merge pull request #190 from Ishap/master

ERT changes! And a bug fix!
Read Changelog for updates, so many shoo.
Map forgets D:
Fixes conflict?
Merge pull request #192 from jamiedigweed/master

Update to current
Merge pull request #191 from jamiedigweed/Jamie

Alot of changes..
Jump to Mod
Added ICWL check to FindOccupationCandidates
Merge pull request #193 from Maxis010/master

Added ICWL check to FindOccupationCandidates
Should fix spam.
Merge branch 'master' of https://github.com/emmanuelbassil/NSS-Phoenix