Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/.gitignore
	bin/backend/FileServer.class
	src/backend/FileServer.java