complete code for reminder and time zone and merging from kapil_gyupta_branch