Merge pull request #73 from esper/master

More changes from esper
Update to 'Lakeside' map

New heightmap and terrain
Needs a rejig of the objects etc
Merge remote-tracking branch 'upstream/master'