Merge commit 'abf516b4f1cec315a4a13c3edde18a9a925a978c' into feature/issue297-wizard
Squashed 'core/' changes from 0820c08..6c3a8ba

6c3a8ba A first shot at the WebSocketUserInteractionListener
b8aa466 Make CipherSpec default constructor (to allow serialization); relates to #297

git-subtree-dir: core
git-subtree-split: 6c3a8ba29f71f7e5a0859cbabd7016fd2ba949c3
Working Connect via GUI (syncany:// link not yet working)
Squashed 'core/' changes from 6c3a8ba..d6fe1d9

d6fe1d9 Added workaround for 'connect' via GUI with syncany:// link, relates to #297

git-subtree-dir: core
git-subtree-split: d6fe1d9b19fff72ccd2dbd2d5c4fde3f870d795a
Fixed merge issue