Merge branch 'master' of github.com:letsdrink/ouzo

Conflicts:
	test/lib/Ouzo/Utilities/StringsTest.php