Merge branch 'development' into public-corpora

app/__init__.py

app/admin/routes.py

app/models.py

app/profile/__init__.py

app/profile/forms.py

app/profile/routes.py

app/settings/forms.py

app/settings/routes.py

app/static/images/user_avatar.png

app/templates/_sidenav.html.j2

app/templates/profile/edit_profile.html.j2

app/templates/profile/profile_page.html.j2

app/templates/settings/settings.html.j2

migrations/versions/4820fa2e3ee2_.py