Merge branch 'issue/1033' into 'develop'

priv/repo/migrations/20170320193800_create_user.exs

priv/repo/migrations/20170321074828_create_activity.exs

priv/repo/migrations/20170321074832_create_object.exs

priv/repo/migrations/20170330153447_add_index_to_objects.exs

...20170415141210_add_unique_index_to_email_and_nickname.exs

...ons/20170418200143_create_webssub_server_subscription.exs

...ions/20170426154155_create_websub_client_subscription.exs

..._add_id_contraints_to_activities_and_objects_part_two.exs

...grations/20170502083023_add_local_field_to_activities.exs

...po/migrations/20170506222027_add_unique_index_to_apid.exs

priv/repo/migrations/20170529093232_longer_bios.exs

...epo/migrations/20170620095947_remove_activities_index.exs

...o/migrations/20170620133028_add_object_activity_index.exs

...ons/20170620142420_add_object_activity_index_part_two.exs

...migrations/20170701142005_add_actor_index_to_activity.exs

priv/repo/migrations/20170906120646_add_mastodon_apps.exs

...igrations/20170906143140_create_o_auth_authorizations.exs

priv/repo/migrations/20170906152508_create_o_auth_token.exs

priv/repo/migrations/20170911123607_create_notifications.exs

...igrations/20171019141706_create_password_reset_tokens.exs