[epiphany] (19 commits) Non-fast-forward update to branch wip/sync

[Gabriel Ivașcu <gabrielivascu src gnome org>]

The branch 'wip/sync' was changed in a way that was not a fast-forward update.
NOTE: This may cause problems for people pulling from the branch. For more information,
please see:

 https://wiki.gnome.org/Git/Help/NonFastForward

Commits removed from the branch:

  3caad17... prefs-dialog: Add sync settings
  b190aff... synchronizable-manager: Document functions
  95d9fb8... synchronizable-manager: Make _merge_remotes() return a GLis
  48053a4... sync-service: Replace 'service' with 'self'
  ac7f6ec... sync: Replace json_parser_load_from_data() with json_from_s
  71170a5... sync: Better error handling
  7dfd4d3... sync: Discard ephy-sync-utils

Commits added to the branch:

  fa5cb06... prefs-dialog: Add sync settings
  1f4dca1... synchronizable-manager: Document functions
  d488425... synchronizable-manager: Make _merge_remotes() return a GLis
  7cb2061... sync-service: Replace 'service' with 'self'
  5e1b597... sync: Replace json_parser_load_from_data() with json_from_s
  fa7f177... sync: Better error handling
  19a7ce0... sync: Discard ephy-sync-utils
  00bac9c... sync-service: Fix leaks in _do_sign_in()
  37818d0... sync-service: Get crypto keys at sign in and store them in 
  dbc4c1d... sync-service: Use a more suggestive message when storage ve
  45d186f... sync-secret: Remove unused macros
  5870689... sync: Change the way sync tokens are handled
  902e945... sync-service: Rename callback
  97a807a... synchronizable: Use JsonNode * in _to/from_bso()
  ca4cde3... sync-service: Fix goto statements
  d3872ec... sync-service: Fix unref in _download_synchronizable()
  3035169... sync-service: Remove unused field
  ec98f9d... sync-service: Remove some circular dependencies between fun
  ba49112... sync-service: Register/unregister client id at sign in/out