Merge branch 'master' into ExceptionMapper
Whoops, that was not supposed to get into the pull request.
A little patch that allows catching of exceptions that inherit a mapped exception class
Merge branch 'ExceptionMapper'

Conflicts:
	pom.xml