enforce i18n locales
simplified origin filter
fixed whitespace
Merge pull request #288 from innoq/origin_filter

Simplified origin filter
merge master