feed added in the profile page
Merge origin/master

Conflicts:
	module/Application/view/user/profile/index.phtml