Initial commit crearTrofeo
Corrigiendo conflictos
Initial commit Crear Trofeo
Merge branch 'master' into crearTrofeo

Conflicts:
	src/main/webapp/resources/js/falafel/routing/routing.js
Merge branch 'verTrofeo' into crearTrofeo

Conflicts:
	src/main/webapp/resources/js/principal/services/TrofeosServices.js
Actualizando branch
Merge branch 'master' of github.com:GangOfFive/falafel into crearTrofeo
Creacion de trofeos funcional sin imagen
Subir archivos funcional, falta arreglar UI
Arreglando conflictos
CrearTrofeo completado
Corrigiendo bugs de crearTrofeo
Corrigiendo mas bugs
Merge remote-tracking branch 'origin/crearTrofeo' into registroCita