changed from v2
tetete
Merge branch 'v2'

Conflicts:
	index.php
	v1.php