fix Issue #228
fix  Issue #238
fix Issue #245
Email notifications: grammatically and stylistically revised English version
Issue #223
Issue #246
fix Issue #252
Merge pull request #257 from sksdes/master

Грамматические правки в шаблонах писем
fix mailer return-path
Merge remote-tracking branch 'origin/master'
fix бага с прямым эфиром при удалении блога
fix даты рождения в профиле с учетом часовых поясов
fix count users blog
Move vendor js libs to framework folder
Frontend framework
Merge branch 'master' of https://github.com/livestreet/livestreet

Conflicts:
	templates/skin/developer/blocks/block.stream.tpl
added logout function
Merge pull request #28 from vatseek/test

added logout function
Merge pull request #260 from stfalcon-studio/master

added logout function
Merge remote-tracking branch 'livestreet/master' into comment2

* livestreet/master:
  added logout function
  Frontend framework
  Move vendor js libs to framework folder
  fix count users blog
  fix даты рождения в профиле с учетом часовых поясов
  fix бага с прямым эфиром при удалении блога
  fix mailer return-path
  fix Issue #252
  Issue #246
  Issue #223
  Email notifications: grammatically and stylistically revised English version
  fix Issue #245
  fix  Issue #238
  fix Issue #228

Conflicts:
	classes/actions/ActionBlog.class.php