---
Merge branch 'master' of github.com:fobiaweb/php-fobia

Conflicts:
	test.php
test log
htmp dirs
index