Merge remote-tracking branch 'origin/master'

Conflicts:
	index02.php

some minor changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	index02.php
	index03.php
	index04.php
	index05.php