Chat naar frame
Merge remote-tracking branch 'origin/development-master' into Chat_Ron

Conflicts:
	DeSlimsteMens/src/controllers/LobbyController.java
Merge pull request #37 from avans-os/Chat_Ron

Chat naar frame
Bestand werdt niet meegenomen o.0
Merge pull request #39 from avans-os/ChatFrameToevoegen

Bestand werdt niet meegenomen o.0
Merge remote-tracking branch 'origin/development-master' into
ChatFrame_Ron

Conflicts:
	DeSlimsteMens/src/controllers/ChatController.java
	DeSlimsteMens/src/controllers/LobbyController.java
	DeSlimsteMens/src/views/chat/ChatView.java