Improve … everything?
Make bootstrap.php work again
Merge pull request #2 from owncloud/kondou_patch_1

Improve … everything?
Merge branch 'master' into call_autoload_only_if_it_exists

Conflicts:
	server/bin/bootstrap.php