Updated tmx file to reduce to 1 farm. updated colour of tile sets to match the mac screen colour.
Merge branch 'master' of https://github.com/larryPersonal/Nanhua