psr-0 заменен на psr-4
Merge remote-tracking branch 'origin/master'