test
Merge branch 'master' of https://github.com/haoyanfei/private

Conflicts:
	composer.json