remove cglib dependency (no longer needed in Spring 3.2)
Merge branch 'master' into jetty7
Merge branch 'jetty7' into heroku