update from labPC
Merge remote-tracking branch 'origin/master'

Conflicts:
	playGround/test.php