Fix
Merge branch 'master' of github.com:tashik/yafcore

Conflicts:
	application/framework/Zend.php