Merge branch 'hotfix/2.1.4'
Fixed thumbnails for institutes on team list view
Merge branch 'hotfix/2.1.5' into develop
Updated requirements.txt
Re-added mail functionality
Fixed some minor bugs
Improved the activity admin