yujty
Merge branch 'master' into testBlink

Conflicts:
	web/index.php
Merge branch 'master' into testBlink

Conflicts:
	web/index.php