Updates on Homepage
Merge remote-tracking branch 'origin/master'

Conflicts:
	application/controllers/IndexController.php
	application/views/scripts/index/index.phtml