added pop up window task name, descr, done
removed redundant code from tasks.html
trying to fix datepicker
solved merged conflicts
added status button on pop up window
solved merge conflicts
merge conflict