Back to servlet 2.5 because cloudfoundry.com does not support servlet 3.0 yet :(
Merge remote-tracking branch 'origin/master'