Merge origin/master into david
Merge origin/master

Conflicts:
	src/main/webapp/index.jsp
Merge pull request #15 from davidcharles747/master

Integración mantenimiento tabla Amigo de RedSocial