Added Parent Task and Fixed weight

Now need to hook up subtask button
Merge remote-tracking branch 'origin/EVEN-BETTER-UI-BRANCH'