WORKING ALLLLL
Merge origin/master

Conflicts:
	ImageToLetter/src/controller/GUIEngineController.java
	ImageToLetter/src/gui/dialogs/AdditionVariantDialog.java