Upgrade the servlet API we compile against to reflect the container we run on now that plugin uses tomcat7 too
Merge branch 'develop' of github.com:fhanik/uaa into develop
Upgrade servlet version to reflect runtime usage