blog xstream import filter
Merge remote-tracking branch 'origin/master'

Conflicts:
	resources/import/applications/news/news_sample.xlsx