"Agregando /app/friends para probar el clietne de facebook de restFB"
Merge branch 'probando_restfb' of https://github.com/fede1608/TP-Hercules-Tacs-2C2014 into probando_restfb

Conflicts:
	truequelibre/truequelibre-war/src/main/java/com/hercules/truequelibre/HelloApplication.java