good
Merge remote-tracking branch 'origin/master'

Conflicts:
	oleg/index.php
	oleg/view/main/template.php
good