version 0.1
Merge remote-tracking branch 'origin/master'

Conflicts:
	curve/src/com/curve/ui/DessinFrame.java
version 0.2