Merge remote-tracking branch 'github/mattben' into devel

Conflicts:
	web/WEB-INF/views/help/help.jsp