Merge
Merge branch 'master' of https://github.com/TetraWord/TetraWord

Conflicts:
	conf/myConf.properties
	src/GameEngine/Player.java
	src/GraphicEngine/BoardGame2D.java
	src/GraphicEngine/Shape2D.java
Merge branch 'master' of https://github.com/TetraWord/TetraWord
Quelques reflexions pour l'anagramme
Merge branch 'master' of https://github.com/TetraWord/TetraWord

Conflicts:
	src/GameEngine/Dictionnary/Dictionnary.java
Anagramm amélioré
Merge branch 'master' of https://github.com/TetraWord/TetraWord