egift privacy control
Merge branch 'development'