Fix Property filter
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/scripts/directives/sv-txt.js
	app/scripts/services/SearchService.js
Add files
Fix Property filter
Merge remote-tracking branch 'origin/master'