tpl_3
Merge remote-tracking branch 'origin/master'

Conflicts:
	trunk/assets/frontend/css/page.css
	trunk/assets/frontend/css/page.less
tpl_3