Part one is here: #450

This pull request adds the box of medals to the map (Captain's Office), as well as updating the changelog.html

Also includes minor string and sprite fixes.
typo fix for aran
Merge pull request #462 from Ikarrus/fuckingwork

[MAP] Medals Part II
Merge branch 'master' of https://github.com/tgstation/-tg-station into Master

Conflicts:
	html/changelog.html