Ajout de la javadoc, suppression de recherche avance
Merge branch 'master' of https://github.com/bobbylavoie/projets6info

Conflicts:
	Workspace/Jack/src/com/sPirates/Jack/client/RechercheAvanceeView.ui.xml