added  convert DateInfo to Calendar function, so not have to rebuild needed functions
added convert DateInfo to Calendar function, so not have to rebuild needed functions along with comments.
merged in my change to Date Info class of a DateInfo to Calendar Function
//Merge branch 'dev' of https://github.com/tomorrow-nf/wpi-suite-team5 into dev

Conflicts:
	Calendar/src/edu/wpi/cs/wpisuitetng/modules/calendar/models/DateInfo.java
	Calendar/src/edu/wpi/cs/wpisuitetng/modules/calendar/models/entry/Event.java