Paginacion en posts del muro de los amigos
Merge commit 'be1dd1087a4c4a71af3b20b2d3baa86509ea33bd'

Conflicts:
	public/tpl/wall.html
Merge commit '8984a78c5204141b0803718f48e64263ca7066b4'
Merge commit 'd34deb5cf9588479254281be1a6d3ba31097da69'
Merge commit 'ca1f6a6626c35c6092fdd67b9fc8682b7debdfd6'

Conflicts:
	public/tpl/wall.html
Merge remote-tracking branch 'SocialNetwork/Fix-style'
Merge remote-tracking branch 'SocialNetwork/fix.amigos'
flechas albums
Merge branch 'fix.albums'
Merge branch 'master' into Fix-style