cleaned out debug statements, bumped servlets to conform to java 1.7 standards