Merge remote-tracking branch 'origin/master' into gs-master

Conflicts:
 	db/schema.rb

db/migrate/20180410204633_add_fields_to_accounts.rb

@@ -0,0 +1,5 @@
+class AddFieldsToAccounts < ActiveRecord::Migration[5.1]
+  def change
+    add_column :accounts, :fields, :jsonb
+  end
+end