preparation merge
Merge branch 'master' of github.com:kmegaoui/Swing_Morpion

Conflicts:
	Morpion/src/org/rk/MorpionModel.java
correction merge