Merge branch 'features/glitch-soc-frontend' into 'develop'

lib/pleroma/user.ex

lib/pleroma/web/mastodon_api/mastodon_api_controller.ex

lib/pleroma/web/mastodon_api/views/status_view.ex

lib/pleroma/web/router.ex

...leroma/web/templates/mastodon_api/mastodon/index.html.eex

...repo/migrations/20181214121049_add_bookmarks_to_users.exs

test/user_test.exs

test/web/mastodon_api/mastodon_api_controller_test.exs

test/web/mastodon_api/status_view_test.exs