Travis build status for the master branch
Merge and correct the Norwegian character patch
Version bump