Merge origin/develop into develop

Conflicts:
	web/WEB-INF/view/project/searchProject.jsp
Merge origin/develop into develop

Conflicts:
	src/java/controller/ProjectController.java