Merge branch 'theme'

Conflicts:
	index.php
	test.txt