Fix branch

Signed-off-by: emmurphy <emmurphy@wpi.edu>
Merge branch 'GUImDatabase' of https://github.com/Tommzy/wpi-suite into GUImDatabase

Conflicts:
	Core/WPISuite/WebContent/WEB-INF/lib/DefectTracker.jar
	Core/WPISuite/WebContent/WEB-INF/lib/WPISuite-Interfaces.jar
	Janeway/modules/DefectTracker.jar