Merge remote-tracking branch 'origin/gui' into gui

Conflicts:
	HighlanderChef/src/com/highlanderchef/Ingredient.java