Updated AOE to actually maybe do something. Wide hits adjacent targets, Deep hits a random target behind the original and Circle hits everyone next to you.
Fixed various bugs with target selection.
Streamlined names so that techniques and aoe types match. wide, impale and spin. Impale has the extra nasty of a very high chance to get stuck. Lots of skill or brute strength highly recommended. Applied some astyle cleanup as per illi-kuns request.
fix merge faults
merged and styled
compress iteminfo

Conflicts:
	src/item.cpp
increased iteminfo height depending on TERMY
Implemented lua script to verify recipes in JSON.
Added material checking to verifyer.
More fixes to the verifier script.
Avoid loading the same .json twice.
Make the lua binary configurable.
Renamed verifyjson to json-verify as per narc's suggestion.
Add scabbard and sheathable weapons
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA
Add scabbard crafting recipe
Add scabbard to pawn shop, mansion item spawns
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA
Make shishkebab sheathable
Change scabbard weight
Change shishkebab no fuel message
Fix being able to sheathe anything in inventory using its invlet
Fix being able to sheathe nord