Conflicts:
	lib/base.php
	lib/db.php

Remove support of sqlite2

Move loading of all the apps to setting the active navigation entry.

Quick Fix a dirty function preventing showing errors

Fix infield autofill

merge changes discussed in dcneiner pull number 4 'fix for autocomplete issue' including firefox password overlay

LDAP: ldap_explode_dn escaped too much, fix it by manual replacement. Fixes different problems, esp. with non-ascii characters in the dn (#631)

fix regression in file versioning for shared files

Minor cleanup in OC_OCSClient::getKnownledgebaseEntries. Fix for #487

fix checkstyle for files_encryption & files_encryption app, add whitespace for readability

Update lib/image.php

Corrected simple typo

Group name doesn't need to be sanitized before storing it in the database

fix checkstyle for files app

Sharing: Fix false positived v. 2

We can't do the loading before matching the route, because some routes
need to do the loading after matching of the route. For example the
navigation detection of the app settings page.

OC_FSV->copy now only caches files which are copied from data/user/files

provide a safe way to end output buffering