#1691
#1691
Merge branch 'dev' of git://github.com/yupe/yupe into dev
Merge pull request #1697 from diaskooo/dev

Верстка