Merge branch 'master' of github.com:TheDarklingWolf/Cataclysm-DDA

Conflicts:
	crafting.cpp
Merge branch 'glyphs' of git://github.com/tasetase/DDAtase
Merge branch 'master' of git://github.com/TheDarklingWolf/Cataclysm-DDA
fix to make the copy constructor public again. some compilers required it
seem the std::swap default isn't good for overmap so for now duplicate code
Merge github.com:TheDarklingWolf/Cataclysm-DDA
fix max and min count checking
Make picket fence smashable
Merge pull request #248 from benjamg/hotfix/overmap_copy_constructor

fix to make the copy constructor public again. some compilers required it
use omspec before valid can be used
Merge github.com:TheDarklingWolf/Cataclysm-DDA
Merge branch 'hotfix/highway_spawn' of github.com:benjamg/Cataclysm-DDA
Merge pull request #250 from iank/smashable_picket_fence

Make picket fence smashable
Make smashing picket fences drop some 2x4s and nails instead of... spears?
Merge pull request #249 from benjamg/hotfix/highway_spawn

fix max and min count checking
Examine() to iuse::style functions
Merge pull request #252 from Catacstone/explode-examine

Examine() to iuse::style functions
Fix throwing bug

Previously, if a user pressed '0' when selecting target and then fired,
thrown object would always hit with a headshot, no matter the range or
skill.
Merge pull request #255 from iank/throwing_bug

Fix throwing bug
Being on fire now increases bodytemp