popup module
popup:  ignore multiple show's
calendar-popup module
merge calendar-popup into popup
remove calendar-popup