Testing
Merge branch 'master' of https://github.com/mbruton/adapt

Conflicts:
	testing/autoloader.php