WiP
removed gdata.json (to be rebased)
WiP