one marker bugfix and searchbox place
FAO Year Update

Updated FAO year from 2006 to 2011 to reflect newly released data
Merge pull request #605 from jmessinger/patch-1

FAO Year Update
Merge pull request #585 from Vizzuality/feature/submit-story-search-area-and-fixes

one marker bugfix and searchbox place
Merge branch 'master' of github.com:Vizzuality/gfw into staging
conflict merge