changed people class to use the elements on terrain list rather then the local list
Merge branch 'master' into unstable