change propertyfilters to be more generic
Merge remote-tracking branch 'origin/milestone2' into milestone2

Conflicts:
	src/test/java/com/rightmove/es/service/PropertySearchServiceTest.java
Merge remote-tracking branch 'origin/milestone2' into milestone2

Conflicts:
	src/main/java/com/rightmove/es/domain/Property.java
	src/test/java/com/rightmove/es/dao/PropertyDaoImplTest.java
	src/test/java/com/rightmove/es/service/PropertySearchServiceTest.java