fixing Category xml mapping + basic java7 <>