fixed conflicts
Merge remote-tracking branch 'origin/team1-dev' into team1-dev
Fixed Javadocs warnings.
started to work on the yellow boxes, still a few issues to work out
Merge remote-tracking branch 'origin/team1-dev' into team1-dev
Merge remote-tracking branch 'origin/team1-dev' into team1-dev
Added labels to Charts, fixed up gui, making it prettier.
fixed some bugs, in the delete button and in some asthetics issues
log needed
Merge remote-tracking branch 'origin/team1-dev' into team1-dev

Conflicts:
	RequirementsManager/test_PermissionsLog.txt
You can now delete a child and it disassociates from a parent.
Requirements with same title are treated differently now. Disabled dragging on the Deleted folder.

Signed-off-by: Arica Liu <aricaliu@wpi.edu>
Merge remote-tracking branch 'origin/team1-dev' into team1-dev
Deleted some extraenous stuff from Chris's commit
Merge branch 'team1-dev' of github.com:cmdunkers/wpi-suite-tng into team1-dev
Screwed around with the Scroll Pane. Committing before adding a Split Pane and I screw everything up.

Signed-off-by: Evan Polekoff <epolekoff@gmail.com>
Merge branch 'team1-dev' of https://github.com/cmdunkers/wpi-suite-tng into team1-dev
Change the estimate of a parent after its child is deleted
Fixed the inset problem in iteration panel, everytihng is lined up now.
Changed the dropdowns in chart view to be white
changed the create child button to be hidden when no permission, as opposed to disabled.
Clear the selection when the table be opened

Signed-off-by: tianyuli <tli@wpi.edu>