Update extension finder and debug container
Merge branch 'master' into master-updates

Conflicts:
	tests/framework/extension_database_test_case.php
Merge pull request #17 from VSEphpbb/master-updates

Update extension finder and debug container