Fixed issue number 7, mostly, but null pointer exception.
Bugfix for issue #34
Merge branch 'dev' into dev-bugfix#7

Conflicts:
	RequirementsManagement/src/edu/wpi/cs/wpisuitetng/modules/requirementsmanagement/gui/NoteMainPanel.java
Merge branch 'dev' of github.com:alexhenning/wpi-suite-tng into dev-bugfix#7
Fixed merge error.
Merge branch 'dev-bugfix#34' into dev
Merge branch 'dev-bugfix#7' into dev
fix #53
Merge branch 'dev' of https://github.com/alexhenning/wpi-suite-tng into dev