Merge remote-tracking branch 'origin/v1.0' into v1.0

Conflicts:
	README
	index.php
return back to basic