Add alarm for EDD expire. Update JsonParseUtil according to updated service. Use IntentService instead of Service for UserDataPushService.
Merge branch 'master' of https://github.com/Apptitive/Ma-o-Shishu
Add EDD expire notification.
Merge branch 'iftekhar_features' of https://github.com/Apptitive/Ma-o-Shishu into iftekhar_features