Merge origin/master

Conflicts:
	src/GameEngine/CurrentShape.java
Merge origin/master

Conflicts:
	conf/myConf.properties
Bug du dessin des briques de la grille fixed