Merge commit 'b8fd3a42d4b096ee2aa753bbe197f68969fcf137'

Conflicts:
	application/controllers/home.php