header and popular changes.
Merge branch 'redesign' of https://github.com/prolific8/hhtfc into redesign

Conflicts:
	application/models/site_model.php