change text
Merge branch 'master' into text

Conflicts:
	index.php