comments
Merge pull request #3 from livestreet/master

update
fix remark
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
set parent_id null if 0 before Comment_GetCommentUnique
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
Frontend framework, fix synio
Fix modals
fix broken commit
Merge remote-tracking branch 'livestreet/master' into com

* livestreet/master:
  Fix modals
  Frontend framework, fix synio
fix plugin page
fix Router - remove empty last param
Функционал категорий для блогов
Restore install folder