Lots of new drinks& ingredients

Added tons of new drinks (e.g. Saltini, Devil’s Eye, Flaming Meteor,
Vitamin Shot, etc) and a bunch of new ingredients. Some ingredients
have been renamed or shifted around.
Merge branch 'master' of https://github.com/FortOyer/ProjectNovel

Conflicts:
	game/content/combinationitems.xml