Changes to homepage, sleep and play
Merge remote-tracking branch 'origin/master'

Conflicts:
	application/models/attractions.php