Refactoring & Version Appengine 1.8.2 GSON 2.2

Change-Id: Iceeb4332295066753cbcdaa0969c8aa5c816ca83