Merge origin/develop into develop

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