Merge branch 'master' of git://github.com/tgstation/-tg-station.git

Conflicts:
	icons/obj/lighting.dmi

Signed-off-by: Firecage <firecage@hotmail.com>