Updated xataface to latest
Updated g2 module to latest master