Employee
Merge remote-tracking branch 'origin/employees' into Dev

Conflicts:
	ProjAppliWeb/src/main/java/m2/project/config/WebSecurityConfig.java
	ProjAppliWeb/src/main/java/m2/project/controller/CustomerController.java