Merge origin/master

Conflicts:
	protected/models/Article.php
Merge origin/master
Merge origin/master

Conflicts:
	protected/models/Article.php
Merge origin/master

Conflicts:
	protected/modules/poll/components/EPoll.php
	protected/modules/poll/controllers/AjaxController.php
	protected/modules/poll/controllers/PollController.php
	protected/modules/poll/views/poll/results.php
	protected/views/front/site/index.php
	scripts/scripts.js
Merge origin/master

Conflicts:
	protected/modules/poll/components/EPoll.php
	protected/modules/poll/controllers/AjaxController.php
	protected/modules/poll/controllers/PollController.php
	protected/modules/poll/views/poll/results.php
	protected/views/front/site/index.php
	scripts/scripts.js