calendar in app, no button shows working
fixed datepicker
fixed merge errors
changed accordion and fixed datepicker and js