Nothing
Merge branch 'master' of https://github.com/bobbylavoie/projets6info

Conflicts:
	Workspace/Jack/war/WEB-INF/classes/com/sPirates/Jack/client/TablePresenter$1.class

nothing
Suppression de commentaire. Connexion LDAP
Merge branch 'master' of https://github.com/bobbylavoie/projets6info

Conflicts:
	Workspace/Jack/src/com/sPirates/Jack/server/LoginActionHandler.java
	Workspace/Jack/src/com/sPirates/Jack/server/guice/ServerModule.java
	Workspace/Jack/war/WEB-INF/classes/com/sPirates/Jack/Lucene/Indexer.class
	Workspace/Jack/war/WEB-INF/classes/com/sPirates/Jack/client/DeveloperHomePresenter$MyView.class
	Workspace/Jack/war/WEB-INF/classes/com/sPirates/Jack/client/DeveloperHomePresenter.class
	Workspace/Jack/war/WEB-INF/classes/com/sPirates/Jack/client/DeveloperHomeView.class
	Workspace/Jack/war/WEB-INF/classes/com/sPirates/Jack/client/DeveloperHomeView.ui.xml
	Workspace/Jack/war/WEB-INF/classes/com/sPirates/Jack/client/TablePresenter$1.class
	Workspace/Jack/war/WEB-INF/classes/com/sPirates/Jack/client/gin/ClientModule.class

Merge file