Updated changelog
The prequeisite Gia related code beautification pull
Map fixes.

Fixes mysterious floating kitchen APC. I hate APC directions sometimes.
Also fixes the missing floor under the maintenance hatch near the
incinerator.
Syringe guns can suck it.
Merge pull request #2212 from fleure/log

Updated changelog
I really can't explain what was going on

In the heads of staff meeting room. A missing wall and a floating
entertainment monitor...
Merge pull request #100 from JacobLee1/Mapchanges-for-the-win

Map fixes.
The Great Code/Icon Organization of 2014
Moar map fixes.
Plasma pistol! Not on the map yet though, dunno where to put it.
changes strings to paths on the mining machinery code
Merge pull request #2214 from Aranclanos/IntiFetishNotInMyGame

Removes the gag ball.
Resolving conflicts

God hates git
And so do i
Merge pull request #2131 from Razharas/MachinesOverhaulANdR&D

Constructable machines will depend on R&D parts
Merge branch 'master' of https://github.com/tgstation/-tg-station into kittens

Conflicts:
	code/modules/mob/living/simple_animal/simple_animal.dm
Changelog update [MERGE QUICK]

For R&D and channels colours
Merge pull request #2225 from Razharas/Changeloing

Changelog update [MERGE QUICK]
Changed the telecomsat z level's "AI Satellite Teleporter Room" a bit. You can now actually build a teleporter there (You will need to build an APC first, materials are avaliable right off the bat.)
Merge pull request #2217 from Giacom/readme_update

README update with written standards and quality.
Merge pull request #2207 from Cluwnes/tcomrades

Added ckey + real_name logging to server logs for "NTLS"