Merge branch 'master' of https://github.com/Warosaurus/Dare2Date

Conflicts:
	Client/src/ProfileWindow.java
	NBClient/Client/build/built-jar.properties
	NBClient/Client/build/classes/ProfileWindow.class
	NBClient/Client/dist/Dare2Date.jar
	Server/src/Server/ServerImpl.java