Merge origin/develop into develop

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