Merge origin/master

Conflicts:
	css/template.css
	protected/components/widgets/views/quest.php
	scripts/bootstrap.js
Merge origin/master
Merge origin/master

Conflicts:
	css/template.css
	protected/components/widgets/views/quest.php
	scripts/bootstrap.js
Merge origin/master

Conflicts:
	css/template.css
Merge origin/master

Conflicts:
	css/template.css
Merge origin/master

Conflicts:
	css/template.css
Merge origin/master

Conflicts:
	css/template.css
Merge origin/master

Conflicts:
	css/template.css
Merge origin/master

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

Conflicts:
	protected/views/front/article/view.php