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

Conflicts:
	web/WEB-INF/view/about.jsp