adding update nonprofit modal
merge conflicts
Merge branch 'master' of https://github.com/thegoodnetwork/thegoodnetwork
accepted all changes from both