added datepicker in pop up window
added datepicker and hours estimate
solved merge conflicts