Translation of some comments

Translation of some comments
Merge remote-tracking branch 'origin/master'

Conflicts:
	CandyCrush/src/algorithms/Algorithms.java