Fixed BUGS in last changes of WaypointController.java and TripController.java