This commit was to stow away some of the files before merging the trunk
to our branch
Merge remote-tracking branch 'origin/dev' into client_server_dev
Added Event controller operations into the controller package. This is
just an add of files that don't exactly build yet. The classes are very
much under construction.
Merge remote-tracking branch 'origin/dev' into client_server_dev
Fixed the build on this branch. This code is written in an effort to see
if anything would be sent to the message. A merge with dev will occur
before pusing everything in earnest to the server.
Small spelling mistake cleanup, prepare for wipe and repull.
Merge remote-tracking branch 'origin/dev' into client_server_dev

Conflicts:
	Calendar/src/edu/wpi/cs/wpisuitetng/modules/calendar/model/Event.java
	Calendar/src/edu/wpi/cs/wpisuitetng/modules/calendar/model/EventEntityManager.java
Added a test source folder for the calendar controller for now. This
will most likely change in the next commit.
Removed conflicting duplicate of Entity Manager on this branch. General
refactoring to solve other conflicts in code.
Merge remote-tracking branch 'origin/dev' into client_server_dev
Added missing method to initialize a static instance of the Add Event
controller. Added two more classes to just get the events that we have
stored.
Previous commit accidentally broke build. This is a fix to allow the
branch to build.
Merge remote-tracking branch 'origin/dev' into client_server_dev
commited garbage comment to test push
removed garbage comment
Merge pull request #6 from frenchie16/client_server_dev

Client server dev
Merge remote-tracking branch 'origin/dev' into origin/user_client_dev
?
Merge branch 'user_client_dev' of https://github.com/frenchie16/wpi-suite-team6.git into origin/user_client_dev
Changed commitment.java to throw exceptions, and changed tests to comply
with these changes