Squashing commits
Merge branch 'master' of https://github.com/tgstation/-tg-station into 11-23-2013-PlantMatter

Conflicts:
	code/game/gamemodes/changeling/changeling_powers.dm
	html/changelog.html
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
	icons/mob/mask.dmi
Manual fix since no one seems to know any other way to fix it.
Merge branch '11-23-2013-PlantMatter' of https://github.com/Adrinus/-tg-station into adrinus

Conflicts:
	code/game/machinery/drying_rack.dm
	code/game/objects/items/weapons/cigs_lighters.dm
	code/modules/hydroponics/grown.dm