Account: Add a scoped pointer to the ownCloud theme.
folderman: make escapeAlias public as its now used in accountmigrator.
cfg migration: Add a account migrator class.
ownCloud Theme: Implement appName() and appNameGUI().
Account: Add a wasMigrated flag.

If an account in a branded client was migrated from a former ownCloud
configuration, the method wasMigrated() will return true.
FolderMan: Migrate folderlist if no folder definitions can be found

and the account indicates that it was migrated. In that case,
read the folder definitions from the ownCloud config directory.
Account: Read settings from ownCloud config if no branded exists.

If there is not yet a config for a branded client, but one for the
"normal" client targetting the same URL, it will be migrated.
Account: Added missing include statement.
AccountMigrator: Do not inherit from QObject as it is not needed yet.

As requested by Danimos review.
AccountMigrator: Read path from QDir::fromNativeSeperators(), add debug.
Bumped the release number to 1.6.2, Changelog additions.
shibboleth: Fix connection when the URL do not have a path

When the url do not have a path (for example: "http://example.com" as
opposed to "http://example.com/"),  its path is not a prefix of the
root path of the cookie (usually '/')

By adding the dav path, we make sure the URL has a path.

This made a bug when the owncloud url was just a domain name and did not
have a path
Fix issue#2004 -- mandir must be man1, not man
wizard: don't call initializePage

It is called automatically by QWizard and do not need to be called explicitly

But setVisibla(false) don't really have an effect there since show() is going
to be called on the page
Merge pull request #2013 from owncloud/fix-man-dir-16

Fix issue#2004 -- mandir must be man1, not man
Nautilus Overlays: Rename icons according to branding.

Added a script that renames the icons and patches the python file for
nautilus.
Merge remote-tracking branch 'origin/reuse_oc_config' into 1.7

Conflicts:
	src/CMakeLists.txt
	src/mirall/folderman.cpp
	src/mirall/folderman.h
	src/mirall/owncloudtheme.h
Fixing spellingerror

GNU Public License -> GNU General Public License
Merge missing commits from 1.6.2-themefix  into 1.7

Conflicts:
	VERSION.cmake
Fix minor Python syntax errors

The installation fails because of these:

	TabError: inconsistent use of tabs and spaces in indentation
	SyntaxError: Missing parentheses in call to 'print'