Profile page edit
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/be/kdg/trips/controllers/LoginController.java
	src/main/java/be/kdg/trips/model/User.java
TripService added
TripService added