commit 10
Merge commit 'ade3d30213790dcac07000e10cf26a04c38f8130'

Conflicts:
	index.php
Merge origin/master

Conflicts:
	index.php