Correction of UML Diagram 2

Correction of UML Diagram 2
Correction of UML Diagram 3

Fail of the precedent commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	CandyCrush/src/controler/GameControlerObserver.java
	CandyCrush/src/manager/GameManager.java