Merge "Added gson dependency" into idea133