Fixed a bug that wouldn't save child IDs in the childRequirementIDs field of Requirement
Made some changes to fit the idea of child requirements set by Martin
Merge remote-tracking branch 'origin/team1-dev' into team1-dev-estimate
Added a parentRequirement to the Requirement View to compare certain fields
Added functionality to get total estimates, not finished yet.
Merge remote-tracking branch 'origin/team1-dev-estimate' into team1-dev-estimate
Adding the retrieveParentRequirementController and observer
Fixing merge conflicts.
Merge remote-tracking branch 'origin/team1-dev-estimate' into team1-dev-estimate
Merge remote-tracking branch 'origin/team1-dev' into team1-dev-estimate
Merge remote-tracking branch 'origin/team1-dev-estimate' into team1-dev-estimate

Conflicts:
	RequirementsManager/src/edu/wpi/cs/wpisuitetng/modules/RequirementsManager/charts/BarPieChartPanel.java
	RequirementsManager/src/edu/wpi/cs/wpisuitetng/modules/RequirementsManager/charts/BarPieChartView.java
	RequirementsManager/src/edu/wpi/cs/wpisuitetng/modules/RequirementsManager/charts/controller/ChartTypeListener.java
	RequirementsManager/src/edu/wpi/cs/wpisuitetng/modules/RequirementsManager/charts/controller/SubDivisionListener.java
	RequirementsManager/test_PermissionsLog.txt
Moved a call to the server to the RequirementView, where it should be
Moved some things around in the Requirements View
Made some changes to allow asynchronous setting of the iterations combo box
Getting the total of child requirements in the parent requirement works, as long as the children do not have children. Some Javadocs errors were also fixed.
Merge remote-tracking branch 'origin/team1-dev' into team1-dev-estimate

Conflicts:
	RequirementsManager/documentation_checked_files.txt
	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/BatchRequirementEditController.java
	RequirementsManager/src/edu/wpi/cs/wpisuitetng/modules/RequirementsManager/requirements/observer/BatchRequirementEditRequestObserver.java
	RequirementsManager/src/edu/wpi/cs/wpisuitetng/modules/RequirementsManager/requirements/observer/BatchUpdateRequirementRequestObserver.java
	RequirementsManager/src/edu/wpi/cs/wpisuitetng/modules/RequirementsManager/requirements/observer/CreateRequirementRequestObserver.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/tabs/RequirementListView.java
	RequirementsManager/test/edu/wpi/cs/wpisuitetng/modules/RequirementsManager/entitymanager/RequirementStoreTest.java
	RequirementsManager/test/edu/wpi/cs/wpisuitetng/modules/RequirementsManager/models/AcceptanceTestTest.java
	RequirementsManager/test/edu/wpi/cs/wpisuitetng/modules/RequirementsManager/requirements/RequirementPanelViewTest.java
	RequirementsManager/test_PermissionsLog.txt
Deleted the permissions file
Deleted some files from merge
Fixed a null pointer exception in the status listener
Merge remote-tracking branch 'origin/team1-dev-estimate' into team1-dev-estimate

Conflicts:
	RequirementsManager/src/edu/wpi/cs/wpisuitetng/modules/RequirementsManager/requirements/RequirementPanel.java
	RequirementsManager/src/edu/wpi/cs/wpisuitetng/modules/RequirementsManager/requirements/StatusListener.java
	RequirementsManager/src/edu/wpi/cs/wpisuitetng/modules/RequirementsManager/requirements/controller/SaveRequirementController.java
	RequirementsManager/src/edu/wpi/cs/wpisuitetng/modules/RequirementsManager/requirements/tabs/AcceptanceTestsView.java