Merge pull request #249 from solispauwels/master

Locale user settings & Save resource zoom in session