d
Merge branch 'master' of https://github.com/NetLanPlayer/LanPlayer.git

Conflicts:
	LanPlayer/LanPlayer/src/client/Client.java
	LanPlayer/LanPlayer/src/server/Server.java