1111111111111
Merge branch 'master' of https://github.com/y390981782/test

Conflicts:
	App/Modules/Home/Action/FriendAction.class.php