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

Conflicts:
	Workspace/Jack/src/com/sPirates/Jack/client/DepotDocument/DepotDocumentView.ui.xml
	Workspace/Jack/war/WEB-INF/classes/com/sPirates/Jack/Lucene/Indexer.class
Nothing