Merge from_git

Conflicts:
	index.php
Merge from_git

Conflicts:
	index.php