update test
sort findAll
Merge branch 'step3' into step3-solution

Conflicts:
	src/main/java/fr/xebia/xke/java8/data/User.java
	src/main/java/fr/xebia/xke/java8/step3/UserService.java
refactor find all ordered
add retrieveActiveUserByRole
Merge branch 'step3' into step3-solution

Conflicts:
	src/main/java/fr/xebia/xke/java8/step3/UserService.java
change expired date calculation
refacto retrieveActiveUserByRole