the other dev
Merge branch 'otherdev' into release

Conflicts:
	index.php