tried to fix bug where adding child requirements isn't reflected in the
history log, failed but was able to fix one bug along the way. Have NO IDEA
why it's failing!
tried to fix the history log, still to no avail
Merge remote-tracking branch 'origin/team1-dev' into team1-fixHistoryLog

Conflicts:
	RequirementsManager/src/edu/wpi/cs/wpisuitetng/modules/RequirementsManager/entitymanager/RequirementStore.java
	RequirementsManager/src/edu/wpi/cs/wpisuitetng/modules/RequirementsManager/requirements/observer/CreateRequirementRequestObserver.java

Conflicts resolved!
I FIXED THE GOD BUG!!!!!!!!!!!

Signed-off-by: Michael French <mwfrench@wpi.edu>
Merge remote-tracking branch 'origin/team1-dev' into team1-fixHistoryLog

Conflicts:
	RequirementsManager/src/edu/wpi/cs/wpisuitetng/modules/RequirementsManager/requirements/observer/CreateRequirementRequestObserver.java

conflicts fixed!
Merge remote-tracking branch 'origin/team1-fixHistoryLog' into team1-dev
Merge branch 'team1-dev' of https://github.com/cmdunkers/wpi-suite-tng into team1-dev