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

Conflicts:
	Workspace/Jack/war/WEB-INF/classes/com/sPirates/Jack/server/guice/ServerModule.class

Merge
merge