Ajout de .gitignore
mise à jour pour linux.
Modification non checké
Merge branch 'master' of https://github.com/mpatron/my-jee6-app

Conflicts:
	my-jee6-ejb/src/test/java/org/jobjects/orm/tools/EJBContainerEmbedded.java
Ajout d'une info sur un exemple
Merge remote-tracking branch 'origin/master' into architecture
Merge commit '23f9b902ae8f7890f1e7203ac5f4aaba739e99cd' into
architecture

Conflicts:
	.gitignore