minor
Merge branch 'master' of https://github.com/orachid/yacramanager.git

Conflicts:
	src/main/java/fr/wati/yacramanager/config/WebSecurityConfig.java