GH-1 In order to clean up application changed web.xml header to 2.5 version
GH-1 In order to update junit and tests merged mine and matthias changes