got datepicker working
added calendar
fixed conflicts