Update news page
Merge branch 'master' of https://github.com/freelancevn/granddesign

Conflicts:
	app/default/views/common/header.phtml
	data/default/templates_c/%%B9^B90^B90A13D0%%header.phtml.php