Resolved merge conflict
Resolved merge conflict

rafaelmds/fatiando,fatiando/fatiando,fatiando/fatiando,victortxa/fatiando,eusoubrasileiro/fatiando,eusoubrasileiro/fatiando_seismic,santis19/fatiando,mtb-za/fatiando,victortxa/fatiando,eusoubrasileiro/fatiando_seismic,drandykass/fatiando,rafaelmds/fatiando,eusoubrasileiro/fatiando,cmeessen/fatiando,drandykass/fatiando,santis19/fatiando,mtb-za/fatiando,eusoubrasileiro/fatiando,cmeessen/fatiando