fixed remove/editQuestionToLocation
Merge remote-tracking branch 'origin/master'

Conflicts:
	Model/src/test/java/be/kdg/trips/TestTrip.java