Merge branch 'dev' of git://github.com/yupe/yupe into bugfix2
"EMail"
авторизация по логину
Merge branch 'bugfix2' of https://github.com/ftrsoft/yupe into bugfix2