add date to gift received and delivered
fix manage view merge conflict