test
Merge branch 'develop' of https://github.com/FarmerLi/FarmerPHP into feature/test3

Conflicts:
	test
test
test
cname
Merge branch 'feature/test3' into develop