Merge branch 'feature/custom-fields' into 'develop'

Add custom profile fields

See merge request pleroma/pleroma!1488

diff --cc CHANGELOG.md
Simple merge

diff --cc lib/pleroma/html.ex
Simple merge

diff --cc lib/pleroma/user.ex
Simple merge

diff --cc lib/pleroma/web/activity_pub/activity_pub.ex
Simple merge

diff --cc lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
Simple merge

diff --cc lib/pleroma/web/mastodon_api/views/account_view.ex
Simple merge