Merge origin/develop into develop

Conflicts:
	src/java/controller/ProjectController.java
Merge origin/develop into develop