added status button on pop up window
task input bar style
merge conflict
solve merge conflict
added datepicker in pop up window