Merge pull request #1 from ananthakrishnanprakash/master

updatedSessionCalendaer
fixed conflict issue with merge request
fixed conflict issue with merge request
Delete Application.cfc~

temp file
Delete addBug.cfm~