Merge remote-tracking branch 'origin/team1-dev' into team1-filter

Conflicts:
	RequirementsManager/test/edu/wpi/cs/wpisuitetng/modules/RequirementsManager/requirements/RequirementPanelViewTest.java
Merge remote-tracking branch 'origin/team1-dev' into team1-filter
added ability filter by user and iteration
Merge remote-tracking branch 'origin/team1-dev' into team1-filter

Conflicts:
	RequirementsManager/test_PermissionsLog.txt

Also prevented filters from filtering Iterations while in Iteration panel