Merge pull request #5045 from owncloud/dbjournal_per_account

Allow a folder to be synced to several accounts. This changes the path of the sync journal file!

diff --cc src/cmd/cmd.cpp
Simple merge

diff --cc src/gui/accountsettings.cpp
Simple merge

diff --cc src/gui/folder.cpp
Simple merge

diff --cc src/gui/folderman.cpp
Simple merge

diff --cc src/gui/folderman.h
Simple merge

diff --cc src/gui/owncloudsetupwizard.cpp
Simple merge