pom fix
Merge remote-tracking branch 'pjolszewski/RELEASE-2.1-JSP' into RELEASE-2.1
incident message files moved to proper location
Repaired tests and version updated to beta 3