added methods to find property associations
fixed wizard to replace existing property association instead of adding
the new one as second.
Merge remote-tracking branch 'origin/develop' into develop