Manually resolved bad merge in last commit
Manually resolved bad merge in last commit

G1DR4/client,christianrafael/client,pedromarins/client,viniciusboson/client,fcruz/client,viniciusboson/client,projectbuendia/client,luisfdeandrade/client,christianrafael/client,luisfdeandrade/client,projectbuendia/client,viniciusboson/client,llvasconcellos/client,projectbuendia/client,luisfdeandrade/client,projectbuendia/client,christianrafael/client,jvanz/client,llvasconcellos/client,llvasconcellos/client,projectbuendia/client