CDB-1526 && CDB-1759 #resolve - Changed color picker for wizards and basemap
and new files added