Merge origin/master

Conflicts:
	protected/views/front/article/view.php
Merge origin/master

Conflicts:
	protected/views/front/article/view.php
Merge origin/master

Conflicts:
	protected/views/front/article/view.php
Merge origin/master

Conflicts:
	protected/views/front/article/view.php
Merge origin/master

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