Committing icons and code edits first
cleaning dme
changelog update
map tweak
Merge branch 'refs/heads/master' into Bleeding-Edge
Merge branch 'refs/heads/Bleeding-Edge'

Conflicts:
	baystation12.dme
	maps/tgstation.2.1.0.0.1.dmm