issue #72 fix
solve join ambiguity in _filter_property
Merge branch 'fix-property-filter' into images

Conflicts:
	grano/model/property.py