logout style
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/com/realdolmen/travel/controller/UserController.java
added some navigation rules
fixed some navigation