Calendar

Went through and commented out all of the android errors in the
Calendar code
Calendar Conflict

Getting rid of the sync conflict