updated to Spring 4.0 and Servlet 3.0