Updated how field/getter/setter are selected when deciding which to use for the property type and for adding annotations.
Authored by: toaomalkster 2013-10-06
Parent: [r503]
Child: [r505]