Fixed up a bad merge
Fixed up a bad merge

carlosrusso/cdf,pedrofvteixeira/cdf,pedrofvteixeira/cdf,davidmsantos90/cdf,pamval/cdf,gcnonato/cdf,gcnonato/cdf,diogofscmariano/cdf,davidmsantos90/cdf,Aliaksandr-Kastenka/cdf,carlosrusso/cdf,diogofscmariano/cdf,pamval/cdf,akhayrutdinov/cdf,eliofreitas/cdf,bytekast/cdf,e-cuellar/cdf,plagoa/cdf,scottyaslan/cdf,Tiger66639/cdf,pamval/cdf,bytekast/cdf,miguelleite/cdf,jvelasques/cdf,bytekast/cdf,eliofreitas/cdf,krivera-pentaho/cdf,dcleao/cdf,afrjorge/cdf,e-cuellar/cdf,pedrofvteixeira/cdf,akhayrutdinov/cdf,davidmsantos90/cdf,diogofscmariano/cdf,carlosrusso/cdf,Aliaksandr-Kastenka/cdf,Tiger66639/cdf,webdetails/cdf,gcnonato/cdf,webdetails/cdf,akhayrutdinov/cdf,krivera-pentaho/cdf,dcleao/cdf,plagoa/cdf,Tiger66639/cdf,jvelasques/cdf,krivera-pentaho/cdf,scottyaslan/cdf,dcleao/cdf,scottyaslan/cdf,miguelleite/cdf,Aliaksandr-Kastenka/cdf,plagoa/cdf,miguelleite/cdf,jvelasques/cdf,e-cuellar/cdf,eliofreitas/cdf,afrjorge/cdf,afrjorge/cdf,webdetails/cdf