Merge branch 'master' of github.com:TheDarklingWolf/Cataclysm-DDA
Javelins added, basically an upgraded wooden spear.
Added the ability to recover CBMs from butchered shocker zombies.
Merge branch 'master' into shocker_changes

Conflicts:
	mtypedef.cpp
Merge pull request #170 from GlyphGryph/shocker_changes

Added the ability to recover CBMs from butchered shocker zombies.
typo in MF_NO_BREATHE flag.
Moved templates to save folder.
Merge branch 'master' of https://github.com/TheDarklingWolf/Cataclysm-DDA
Craftable shovels, hammers and axes. Not yet added to crafting recipes.
Construction fix.
Merge pull request #173 from OzoneH3/master

Moved templates to save folder. Construction fix.
Fixed itype order again.
Merge branch 'master' of https://github.com/TheDarklingWolf/Cataclysm-DDA
Fixed broken crafting recipes for primitive tools
Bumped alcohol required for torches and bandages to 7, added gin and triple-sec to recipes
Reinforced tag is now applied to winter boots and rain coats. Fixed crafting.cpp error.
Chitinous boots and gauntlets.
Destroy picklock kit when its damaged 5 times.
Base determination of whether a tile is outside on g_light_level instead of natural_light_level.
Center lightmap cache generation on player so it doesn't shift when you move the view.