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