"Agregando Jamon y exchange requests"
Agregando ExchangeTL
Rename Exchange a Trade
Merge https://github.com/fede1608/TP-Hercules-Tacs-2C2014 into exchangeFeature

Conflicts:
	truequelibre/truequelibre-war/src/main/java/com/hercules/truequelibre/FriendsResource.java
Sacando User de Trade
Merge branch 'master' of https://github.com/fede1608/TP-Hercules-Tacs-2C2014 into exchangeFeature

Conflicts:
	truequelibre/truequelibre-war/src/main/java/com/hercules/truequelibre/application/MainApplication.java
Adaptando al get de Uriel
get generico en DBHandler
Agregando parametro generico
Pasando el tipo por constructor
Agregando trades al post de items
Merge branch 'master' of https://github.com/fede1608/TP-Hercules-Tacs-2C2014 into exchangeFeature

Conflicts:
	truequelibre/truequelibre-war/src/main/java/com/hercules/truequelibre/resources/PendingTradesResource.java
Terminando alta de trades