Merge branch 'master' of github.com:alex-k/phpbee.org

git-svn-id: svn+ssh://phpbee.org/home/pahomov/www/phpbee.org/svn/phpbee.org@936 95ad4591-2629-e011-b8a3-0018f302bd40
Merge branch 'master' of github.com:alex-k/phpbee.org