Merge origin/master

Conflicts:
	index2.php
Merge origin/master