Refactor setLocale
Merge branch 'master' of https://github.com/mshr-h/otter

Conflicts:
	src/core/Application.cpp