Merge branch 'release/0.14'

.env.dev

CHANGELOG

api/config/api_urls.py

api/config/settings/common.py

api/config/settings/local.py

api/config/settings/production.py

api/funkwhale_api/__init__.py

api/funkwhale_api/common/pagination.py

api/funkwhale_api/common/preferences.py

api/funkwhale_api/common/serializers.py

api/funkwhale_api/favorites/serializers.py

api/funkwhale_api/favorites/views.py

api/funkwhale_api/federation/filters.py

...hale_api/federation/migrations/0006_auto_20180521_1702.py

api/funkwhale_api/federation/models.py

api/funkwhale_api/federation/serializers.py

api/funkwhale_api/federation/views.py

api/funkwhale_api/history/serializers.py

api/funkwhale_api/history/views.py

api/funkwhale_api/manage/__init__.py