Merge remote-tracking branch 'origin/dev' into badge-pictures

Conflicts:
ap/accounts/admin.py
ap/accounts/models.py
ap/ap/settings/base.py
ap/ap/urls.py
ap/templates/base.html
ap/terms/fixtures/initial_data.json
ap/terms/models.py