Merge branch 'master' of https://github.com/GalenEvil/Cataclysm-DDA-1

Conflicts:
	game.cpp
	itype.h
	player.cpp
Alteration of Project file
Merge branch 'master-2'

Conflicts:
	construction.cpp
	crafting.cpp
Bring up to speed with current master repo
Update to CleverRaven Master branch

Conflicts:
	SIGNOFF
	construction.cpp
	crafting.cpp
	data/raw/item_groups.json
	data/raw/items/ammo.json
	data/raw/professions.json
	faction.cpp
	field.cpp
	game.cpp
	game.h
	item.cpp
	itypedef.cpp
	lang/po/cataclysm-dda.pot
	lang/po/fr_FR.po
	lang/po/pt_PT.po
	lang/po/ru_RU.po
	lang/po/zh_CN.po
	newcharacter.cpp
	npctalk.cpp
	output.cpp
	output.h
	player.cpp
	veh_interact.cpp
Merge branch 'master-2'

Conflicts:
	CataclysmWin.cbp
	SIGNOFF
	construction.cpp
	crafting.cpp
	data/raw/items/comestibles.json
	data/raw/items/melee.json
	data/raw/items/ranged.json
	data/raw/professions.json
	data/raw/recipes.json
	field.cpp
	game.cpp
	game.h
	iuse.cpp
	melee.cpp
	monattack.cpp
	monmove.cpp
	newcharacter.cpp
	player.cpp
	ranged.cpp
	ui.cpp
	veh_interact.cpp
Revert "Merge branch 'master-2'"

This reverts commit 9cc0139ed8efe0611cfd050cdb624597e319f893.
Player now searches tiles for warmth while asleep
The player will intelligently use floor items for warmth
Merge branches 'master' and 'sleep-tiles-test' into sleep-tiles-test
Removed uneeded header
Optimizations to warmth while asleep code
Intelligently use floor items for warmth while asleep
Player is informed he is using floor items for warmth during sleep
A little bit of flavor text
Legwear on the floor keeps you warm while you sleep
New bionics, guns, armor, gunmods, etc.
Fixed segfault for sleeping on top of clothes
Changed how the player is informed of sleeping on clothing
Added a volume check to snuggling