Merge origin/develop into develop

Conflicts:
	src/java/controller/AbstractController.java
	src/java/controller/CompetentieController.java
	src/java/controller/ProfileController.java
	src/java/controller/ProjectController.java
	src/java/entities/Project.java
	src/java/models/global/FileUploader.java
	src/java/models/managers/ProjectManager.java
	web/WEB-INF/view/createProject.jsp
	web/WEB-INF/view/project.jsp
Merge origin/develop into develop
Merge origin/develop into develop

Conflicts:
	src/java/controller/AbstractController.java
	src/java/controller/CompetentieController.java
	src/java/controller/ProfileController.java
	src/java/controller/ProjectController.java
	src/java/entities/Project.java
	src/java/models/global/FileUploader.java
	src/java/models/managers/ProjectManager.java
	web/WEB-INF/view/createProject.jsp
	web/WEB-INF/view/project.jsp
Merge origin/develop into develop

Conflicts:
	src/java/controller/AbstractController.java
	src/java/controller/CompetentieController.java
	src/java/controller/ProfileController.java
	src/java/controller/ProjectController.java
	src/java/entities/Project.java
	src/java/models/global/FileUploader.java
	src/java/models/managers/ProjectManager.java
	web/WEB-INF/view/createProject.jsp
	web/WEB-INF/view/project.jsp
Merge origin/develop into develop

Conflicts:
	src/java/controller/AbstractController.java
	src/java/controller/CompetentieController.java
	src/java/controller/ProfileController.java
	src/java/controller/ProjectController.java
	src/java/entities/Project.java
	src/java/models/global/FileUploader.java
	src/java/models/managers/ProjectManager.java
	web/WEB-INF/view/createProject.jsp
	web/WEB-INF/view/project.jsp
Merge origin/develop into develop

Conflicts:
	src/java/controller/ProfileController.java
	src/java/controller/ProjectController.java
	web/WEB-INF/view/modifyProject.jsp