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

Conflicts:
	RequirementsManager/src/edu/wpi/cs/wpisuitetng/modules/RequirementsManager/History/HistoricalChange.java
	RequirementsManager/src/edu/wpi/cs/wpisuitetng/modules/RequirementsManager/entitymanager/AttachmentStore.java
	RequirementsManager/src/edu/wpi/cs/wpisuitetng/modules/RequirementsManager/entitymanager/RequirementStore.java
	RequirementsManager/src/edu/wpi/cs/wpisuitetng/modules/RequirementsManager/filter/RulePanel.java
	RequirementsManager/src/edu/wpi/cs/wpisuitetng/modules/RequirementsManager/requirements/StatusListener.java
	RequirementsManager/src/edu/wpi/cs/wpisuitetng/modules/RequirementsManager/requirements/observer/SaveAttachmentRequestObserver.java
	RequirementsManager/src/edu/wpi/cs/wpisuitetng/modules/RequirementsManager/snake/Controller.java
	RequirementsManager/src/edu/wpi/cs/wpisuitetng/modules/RequirementsManager/tabs/controller/UpdateAllRequirementsController.java
	RequirementsManager/src/edu/wpi/cs/wpisuitetng/modules/RequirementsManager/tree/TreeTransferHandler.java
Merge remote-tracking branch 'origin/team1-dev' into team1-dev