un-deprecated @JsonProperty as we still need it to define field names
and date formats, etc. Changed @AndroidJson to recognise @JsonProperty
and leave well enough alone. Updated the JsonTest to test the above.