Merge branch 'master' into dev-freeze

Conflicts:
	html/changelog.html
Merge pull request #3997 from comma/dev-freeze

Master -> Dev freeze
Compile fix.
Looks like that merge overwrote .dme or something. Or I am just a derp.
Merge pull request #3999 from comma/dev-freeze

Compile fix.
Fixes #3911
Icons for tables were just GONE.
fixes to misc research area.
Added misc research items back into the chamber.
Fixed names and access on doors in misc research.
Merge pull request #4006 from Baystation12/master

merge master into dev-freeze
Merge pull request #4000 from comma/dev-freeze

Fixes #3911
Merge pull request #4008 from DJSnapshot/dev-freeze

fixes to misc research area.
Merge branch 'dev-freeze' of github.com:Baystation12/Baystation12
Emergency Insertion - Supermatter Manual.

/obj/item/weapon/book/manual/supermatter_engine
Mapped in Supermatter Manual / pipes fix.

There were multiple straight pipes going the same direction laying over
each other in the engine room that shouldn't have been there.

Placed the Supermatter Engine book on the CE's desk, engineer's table,
and by the rest of the book.  Plenty of copies.
Merge pull request #4015 from Ccomp5950/master

Emergency Insertion - Supermatter Manual.
Talisman icon bugfix

Cult talismans look like bloody talismans for more than one tick now.
Merge branch 'master' of https://github.com/Baystation12/Baystation12