Merge pull request #1 from l443018/Laura

Laura
Merge pull request #2 from l443018/Laura

1003 wall debug over
1018
Merge branch 'master' into Laura

Conflicts:
	friendList.php