modify
Merge branch 'feature/kaifa1.0' into dev

Conflicts:
	test5.php