Updated view and controller
Merge branch 'master' of https://github.com/SimonTakman/TDA367

Conflicts:

	MouseophonicServer/src/main/java/edu/chalmers/mouseophonic/desktop/ServerView.java