Added two new annotations, one for mapping between a java object field name and a different json name and another for handling conversion between a json type and a different java object field type.