Megamerge

Merged gifts & proposals and editProfile locally to resolve merge conflicts