Merge pull request #213 from aroraumang/feature/task-misc

Fixed issue while editing nereid-user from within party view #5700
Use current_user instead
Merge pull request #215 from prakashpp/develop

Use current_user instead
Fixed render_email method in nereid