изменения за 07-02-13
Merge remote-tracking branch 'origin/master'