Add changes

Lot's of changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	CandyCrush/src/controler/GameControlerObserver.java