merge solved ba7aaa8904186cae4963eee0f2b124aa6aa320e3
merge solved ba7aaa8904186cae4963eee0f2b124aa6aa320e3

apercas/gfw,cciciarelli8/gfw,Vizzuality/gfw,KarlaRenschler/gfw,apercas/gfw,KarlaRenschler/gfw,codeminery/gfw,codeminery/gfw,codeminery/gfw,apercas/gfw,cciciarelli8/gfw,KarlaRenschler/gfw,Vizzuality/gfw,apercas/gfw,KarlaRenschler/gfw,codeminery/gfw