javadocs
Merge branch 'master' of
https://github.com/filipexavier/TrabalhoAD_Grupo5.git

Conflicts:
	src/models/Server.java