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.
Rename qualities to more sensible names.
CBM reshuffle

Breaks the CBM butchering flag into three groups:
CBM_CIV, found on shockers, drops the common bionics.
CBM_SCI from scientists gives augs slanted toward their needs, and
CBM_OP gives augs that a bionic operator might have.

And yeah, you can have those augs when you cut them out of Cpl. Heston's
Cold Dead Corpse.  Created zombie_bio_op, a buffed soldier zed with
shocker counter and a nasty melee special.
init logging after all filenames are set.
add DebugLog init
Tweak bio_op, remove template

Dialed down the loot and changed the color scheme.  Let me know if
you've got any better ideas for the contrast on that zed.

(Needed two shotgun blasts to the head in gun-trials.  I like it!)
Merge remote-tracking branch 'upstream/master' into aoe-fix
merged upstream