Commit pour se mettre a jour
Merge https://github.com/bobbylavoie/projets6info

Conflicts:
	Workspace/Jack/src/com/sPirates/Jack/client/gin/ClientGinjector.java
	Workspace/Jack/src/com/sPirates/Jack/client/gin/ClientModule.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.class
	Workspace/Jack/war/WEB-INF/classes/com/sPirates/Jack/client/DeveloperHomeView.class
	Workspace/Jack/war/WEB-INF/classes/com/sPirates/Jack/client/gin/ClientGinjector.class
	Workspace/Jack/war/WEB-INF/classes/com/sPirates/Jack/client/gin/ClientModule.class
	Workspace/Jack/war/WEB-INF/classes/com/sPirates/Jack/server/guice/ServerModule.class
Afin de faire un merge