Fixed an error in the build xml
Updated package names in CalendarModule to match the project name
Messing with CalendarModule to drop GUI in to Janeway
Merge branch 'calendar_frontend_dev' of
https://github.com/frenchie16/wpi-suite-team6.git into
calendar_frontend_dev

Conflicts:
	Calendar/manifest.txt