fix en
Merge branch 'master' of https://github.com/studiokami/wbhdq

Conflicts:
	application/models/content_model.php
	application/views/en/header.php
	application/views/en/home/home.php