cdb updated
fixing bug when reloads a page when a color map is applied
Merge branch 'develop' into release/2.1
Merge branch 'release/2.1' into develop