update to guava 18 and hibernate 4.3.5
format java and xml files, code cleanup, no actual changes