Controllers edit
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/be/kdg/trips/controllers/ProfileController.java
	src/main/java/be/kdg/trips/controllers/TripController.java
	src/main/java/be/kdg/trips/controllers/TripsController.java
editCredentials
Merge remote-tracking branch 'origin/master'
createTrip edit
tripScontroller delete