fix issue with merged classes
Merge branch 'master' of git://github.com/flack/midgard-portable

Conflicts:
	test/api/storageTest.php