Merge branch 'Database' of https://github.com/Tommzy/wpi-suite into Database

Conflicts:
	Calendar/src/edu/wpi/cs/wpisuitetng/modules/calendar/model/Event.java
test merge
Signed-off-by: Jared-Wormley <jmwormley@wpi.edu>