Updated to new version of lib-directory-autoloader.
Fixed merge-errors.
Merge commit 'a70dd08'

Conflicts:
	core/bootstrap.php