Merge branch 'master' into doctrine2

Conflicts:
	lib/base.php
	lib/db.php
Codestyle cleanup
Change PDO Exceptions to Doctrine Exceptions
Remove MDB2 sqlite3 driver