Se agregó el servicio de getHistorial
Merge branch 'master' of https://github.com/JonathanVilllaverde/GeolocacionPromoGL

Conflicts:
	back/Tracker/src/main/resources/applicationContext.xml
Merge branch 'master' of https://github.com/JonathanVilllaverde/GeolocacionPromoGL

Conflicts:
	back/Tracker/build.gradle
	back/Tracker/src/main/java/com/tracker/controller/TrackerController.java
	back/Tracker/src/main/java/com/tracker/service/TrackerService.java
erge branch 'master' of https://github.com/JonathanVilllaverde/GeolocacionPromoGL

Conflicts:
	back/Tracker/build.gradle
	back/Tracker/src/main/java/com/tracker/service/TrackerService.java
Merge branch 'master' of https://github.com/JonathanVilllaverde/GeolocacionPromoGL

Conflicts:
	back/Tracker/src/main/java/com/tracker/service/TrackerService.java
se agrego el servicio get historial