Merge pull request #2696 from fauxki/bleeding-edge-freeze

BEF - Player Requests Update
Changelog update~ includes a fixed version of faux's changelog
Changelog update~ includes a fixed version of faux's changelog
Merge branch 'bleeding-edge-freeze' of https://github.com/NerdyBoy1104/Baystation12 into bleeding-edge-freeze

Conflicts:
	html/changelog.html
Changelog update~ includes a small typo fix to faux's recent update too.
Merge pull request #2699 from NerdyBoy1104/bleeding-edge-freeze

Changelog update~
Adds new drinks and fixes a few things
Merge pull request #2703 from jediluke69/bleeding-edge-freeze

Adds new drinks and fixes a few things
custom items update
- Michael Guess' golden lighter
- Krinn's saucepan hat
- Writerer's cat thing