rearrange some stuff
less special-casing of non-grant/leave

also, removed duplicate load in CalendarEditActivity.onResume/onCreate
added upload and reload from server functionality