Clean up of files.

Signed-off-by: lmkahn <lmkahn@wpi.edu>
Merge remote-tracking branch 'origin/team1-dev' into team1-dev-cleanup

Conflicts:
	RequirementsManager/src/edu/wpi/cs/wpisuitetng/modules/RequirementsManager/Iteration/IterationPanel.java
	RequirementsManager/src/edu/wpi/cs/wpisuitetng/modules/RequirementsManager/Iteration/IterationView.java
	RequirementsManager/src/edu/wpi/cs/wpisuitetng/modules/RequirementsManager/Toolbar/ToolbarPanel.java
	RequirementsManager/src/edu/wpi/cs/wpisuitetng/modules/RequirementsManager/filter/FilterController.java
	RequirementsManager/src/edu/wpi/cs/wpisuitetng/modules/RequirementsManager/filter/FilterPanel.java
	RequirementsManager/src/edu/wpi/cs/wpisuitetng/modules/RequirementsManager/filter/RulePanel.java
	RequirementsManager/src/edu/wpi/cs/wpisuitetng/modules/RequirementsManager/models/RequirementValidator.java
	RequirementsManager/src/edu/wpi/cs/wpisuitetng/modules/RequirementsManager/requirements/RequirementModel.java
	RequirementsManager/src/edu/wpi/cs/wpisuitetng/modules/RequirementsManager/requirements/RequirementPanel.java
	RequirementsManager/src/edu/wpi/cs/wpisuitetng/modules/RequirementsManager/requirements/RequirementView.java
	RequirementsManager/src/edu/wpi/cs/wpisuitetng/modules/RequirementsManager/requirements/controller/SaveRequirementController.java
	RequirementsManager/src/edu/wpi/cs/wpisuitetng/modules/RequirementsManager/requirements/observer/UpdateRequirementRequestObserver.java
	RequirementsManager/src/edu/wpi/cs/wpisuitetng/modules/RequirementsManager/requirements/tabs/AcceptanceTestsView.java
	RequirementsManager/src/edu/wpi/cs/wpisuitetng/modules/RequirementsManager/requirements/tabs/AssigneeView.java
	RequirementsManager/src/edu/wpi/cs/wpisuitetng/modules/RequirementsManager/requirements/tabs/HistoryView.java
	RequirementsManager/src/edu/wpi/cs/wpisuitetng/modules/RequirementsManager/rmpermissions/UserPermissionPanel.java
	RequirementsManager/src/edu/wpi/cs/wpisuitetng/modules/RequirementsManager/tabs/model/RequirementTableModel.java
Merge remote-tracking branch 'origin/team1-dev' into team1-dev-cleanup

Conflicts:
	RequirementsManager/src/edu/wpi/cs/wpisuitetng/modules/RequirementsManager/filter/FilterController.java
	RequirementsManager/src/edu/wpi/cs/wpisuitetng/modules/RequirementsManager/requirements/RequirementView.java
Merge remote-tracking branch 'origin/team1-dev' into team1-dev-cleanup

Conflicts:
	RequirementsManager/src/edu/wpi/cs/wpisuitetng/modules/RequirementsManager/models/Requirement.java
	RequirementsManager/src/edu/wpi/cs/wpisuitetng/modules/RequirementsManager/requirements/RequirementModel.java
Merge remote-tracking branch 'origin/team1-dev' into team1-dev-cleanup

Conflicts:
	RequirementsManager/src/edu/wpi/cs/wpisuitetng/modules/RequirementsManager/models/AcceptanceTest.java
	RequirementsManager/src/edu/wpi/cs/wpisuitetng/modules/RequirementsManager/requirements/RequirementModel.java
	RequirementsManager/src/edu/wpi/cs/wpisuitetng/modules/RequirementsManager/requirements/controller/SaveAcceptanceTestController.java
	RequirementsManager/src/edu/wpi/cs/wpisuitetng/modules/RequirementsManager/requirements/tabs/AcceptanceTestsView.java
Some more cleanup.
Merge remote-tracking branch 'origin/team1-dev' into team1-dev-cleanup

Conflicts:
	RequirementsManager/src/edu/wpi/cs/wpisuitetng/modules/RequirementsManager/tabs/controller/UpdateAllRequirementsController.java
Totalling estimates of all of the child requirements now works.
Fixed some javadocs warnings.
Merge remote-tracking branch 'origin/team1-dev' into team1-dev-cleanup
Merge remote-tracking branch 'origin/team1-dev-cleanup' into team1-dev

Conflicts:
	RequirementsManager/src/edu/wpi/cs/wpisuitetng/modules/RequirementsManager/tree/TreeTransferHandler.java