added the part of saving the dispensing encounter and add a 2 day buffer to the auto_expire_date
Merge branch 'master' of github.com:BaobabHealthTrust/migration_imports