Uplink Update:

 * Added datums for uplink items. This allows you to easily add items to the uplink in a maintainable manner.
 * This fixes the href exploit which allowed traitors to spawn any item they wish.
 * Made the uplink interface still show unbuyable items, but grayed out.
 * After unlocking your PDA, it will return to the main menu; this will help stop metagamers.
 * Your password will be trimmed, meaning that entering "213 Alpha " will be correct and won't set it as your ringtone.
 * Replaced all the old uplink code, which is useless now.
 * Changed all the feedback procs to instead use the uplink datum's name. This is important if you are keeping track of stats.
 * Moved the bundle uplink item to the "Badass" category.
 * Removed an unneeded variable.
 * Small update to check that user isn't null and that the spawned item is a /obj/item before trying to put it in the user's hand.
Merge branch 'master' of https://github.com/tgstation/-tg-station
Slight remap of the centcom ferry so it would stop draining the air inside.
Reverted unrelated virology commit
 * Fixed the long date format not being consistent with the rest of the change log.
 * The feedback will now use the item's type.
 * Forgot to put the type into a string.
Merge pull request #332 from Giacomand/changelogfix2

AddToChangelog.exe small update.
Merge pull request #194 from Giacomand/href_exploit_fix

Uplink Update: Added datums for uplink items. This allows you to easily add items to the uplink in a maintainable manner.
Merge pull request #322 from Ikarrus/ferryfix

Fix for Centcom Ferry losing air
Merge branch 'master' of github.com:tgstation/-tg-station into blastdoors

Conflicts:
	maps/tgstation.2.1.2.dmm
Added changes from #322