java
java
java
Merge https://github.com/Goggot/Automne2012

Conflicts:
	PO 2 - Java/Java Applets/.data/00000000/00000001.jdb