Ale
Merge branch 'master' of https://github.com/samuelbudusan/UserManagementProject

Conflicts:
	src/main/java/com/evozon/usermanagement/controller/EditUserController.java
	src/main/java/com/evozon/usermanagement/controller/LoginController.java
	src/main/java/com/evozon/usermanagement/dao/UserDAO.java
	src/main/java/com/evozon/usermanagement/dao/file/FileDAO.java
	src/main/java/com/evozon/usermanagement/service/EditUserService.java