modals
Merge branch 'master' of https://github.com/thegoodnetwork/thegoodnetwork
ui changes merge conflicts in myProfile
Merge branch 'master' of https://github.com/thegoodnetwork/thegoodnetwork