Added Settler unit
Merge branch 'master' into develop