modify test5.php
modify test5.php flag in branch kaifa1.0
modify flag in branch dev
Merge branch 'feature/kaifa1.0' into dev

Conflicts:
	test5.php
modify
modify
Merge branch 'feature/kaifa1.0' into dev

Conflicts:
	test5.php
modify
modify test3.php test4.php test5.php
first commit with submodule rack
Merge branch 'feature/kaifa1.0' of github.com:liummpoint/liumm_dev into feature/kaifa1.0
add dir rack
merge from feature/kaifa1.0
modify test5.php
modify test4.php
Merge branch 'feature/kaifa1.0' into dev