Fixed Javadocs warnings.
Merge remote-tracking branch 'origin/team1-dev' into team1-dev
Iteration estimates now work.
Merge remote-tracking branch 'origin/team1-dev' into team1-dev

Conflicts:
	RequirementsManager/src/edu/wpi/cs/wpisuitetng/modules/RequirementsManager/Iteration/IterationPanel.java
	RequirementsManager/src/edu/wpi/cs/wpisuitetng/modules/RequirementsManager/requirements/tabs/TasksView.java