- locationView
- editLocation
- editQuestion
- removeQuestion
Merge remote-tracking branch 'origin/master'

Conflicts:
	WebApp/src/main/webapp/WEB-INF/views/locationsView.jsp
	WebApp/src/test/java/be/kdg/trips/TripTest.java