new version
Merge branch 'b_dev' of https://github.com/php-training/twitter into b_dev