ME: refactored calculation of expiry date
ME: refactored calculation of expiry date

GeoODK/onadata,qlands/onadata,spatialdev/onadata,piqoni/onadata,smn/onadata,piqoni/onadata,piqoni/onadata,sounay/flaminggo-test,spatialdev/onadata,sounay/flaminggo-test,hnjamba/onaclone,qlands/onadata,smn/onadata,GeoODK/onadata,piqoni/onadata,qlands/onadata,sounay/flaminggo-test,qlands/onadata,smn/onadata,GeoODK/onadata,hnjamba/onaclone,hnjamba/onaclone,spatialdev/onadata,sounay/flaminggo-test,spatialdev/onadata,GeoODK/onadata,hnjamba/onaclone,smn/onadata