Merge branch 'master' into glitch-soc/master

Conflicts:
	app/models/account.rb
	app/views/accounts/_header.html.haml

db/migrate/20180506221944_add_actor_type_to_accounts.rb

@@ -0,0 +1,5 @@
+class AddActorTypeToAccounts < ActiveRecord::Migration[5.2]
+  def change
+    add_column :accounts, :actor_type, :string
+  end
+end