Merge origin/master

Conflicts:
	src/java/controller/ClaimsController.java
	web/WEB-INF/views/addClaim.jsp