list properties by criteria
Merge remote-tracking branch 'origin/master'

Conflicts:
	WebContent/WEB-INF/jsp/property/view.jsp
update