Fix for JSONObject marshalling.

The 0.0.2.5 release broke the case where a JSONObject is an indexed field of a DomainClass. This change reorders the test for GeoPoint so that non domainClasses are not affected by th e0.0.2.5 change.