Merge pull request #1138 from onepercentclub/feature/some-fixes-and-merge-dev

Feature/some fixes and merge dev
readded bunch
Update setup.py

Change the jwt refresh token egg
Improve admin for donations