homepage changes
Merge branch 'refs/heads/testing_branch_from_stash'

Conflicts:
	index.php
	textapi.php