make travis happy
Merge pull request #249 from screenconcept/hotfix/make_travis_happy

make travis happy
Merge branch 'master' into features/clean_up_en_locales