friend request button activated
Revert "friend request button activated"

This reverts commit 7203fcf096ad890a2f49081aabade77bba4bac4c.
Merge origin/master
friend request button activated
friend request button activated
Merge origin/master
update
Merge origin/master

Conflicts:
	module/Application/view/layout/layout.phtml
	public/css/style.css
Merge origin/master

Conflicts:
	module/Application/view/layout/layout.phtml
	public/css/style.css
Merge origin/master