Merge branch 'master' of https://github.com/thibautpalier/JollyJumper

Conflicts:
	src/src/com/exia/jollyjumper/model/DAO_BD.java
q<swdxfcghvjbnk