Slideshow
Merge branch 'master' of https://github.com/raymondchandra/hfi

Conflicts:
	app/controllers/admin/HomeAdminController.php