Updated sql2o and added servlet-api