fix heaeder

o
Merge remote-tracking branch 'origin/master'

Conflicts:
	application/apps/blog/views/vblog/edit_post.php