Applied code style
Merge branch 'allocs' into develop

Conflicts:
	src/main/java/nz/org/nesi/researchHub/control/ProjectControls.java

Signed-off-by: echois <eva.chois@gmail.com>