brought back sentry
added some todos in handling zip files
Merge remote-tracking branch 'origin/develop' into develop