complete php test
Merge branch 'master' of https://github.com/locosoft1986/AndroidDevLearn

Conflicts:
	YesOrNoProject/Server/Database/user.sql