Merge branch 'master' of github.com:TheGerbille/JavaCartographie

Conflicts:
	src/javacartographie/Image.java
	src/javacartographie/JavaCartographie.java

test import
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/javacartographie/Image.java