Fixed preferences, hardcoding and languages
Merge branch 'master' of https://github.com/SimonTakman/TDA367

Conflicts:
	MouseophonicServer/resources/clients.txt

MouseophonicServer/src/main/java/edu/chalmers/mouseophonic/desktop/Serve
rController.java