Merge remote-tracking branch 'origin/2.3'

 Conflicts:
	VERSION.cmake

diff --cc doc/owncloudcmd.rst
Simple merge

diff --cc doc/troubleshooting.rst
Simple merge

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

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

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

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

diff --cc src/libsync/propagatedownload.cpp
Simple merge

diff --cc src/libsync/propagateuploadng.cpp
Simple merge