.
.
.
.
Merge branch 'origin/master'

Conflicts:
	nb-configuration.xml
	src/main/java/client/Client.java
	src/main/java/server/IndexFactory.java