CAL-242 fix color selector in add calendar form
CAL-242 merge with relooking