Objectify + Jackson
Merge remote-tracking branch 'origin/Android'
Merge remote-tracking branch 'origin/master' into Android