Add CBM Chain Lightning and related ammo effects
Add new ammo effects to item factory
Lit torches set enemies on fire
Add flaming effect to wide technique attacks
Add check for water tiles in shockwave/knockback
check remaining momentum before calling plswim()
minor fix to scentmap, added more colors to scentmap
Added bionics.json
Made init_bionics() read from bionics.json
Updated code documentation for bionics

Why is the documentation stored both in DEVELOPER_FAQ.txt and in
EDITING? These two files should probably be consolidated.
butcher: preserve mtype on meat. iteminfo: "Smells like <original mobtype>", for
players with carnivore, or scentmap, or cheating bastards
FIX #560

Fixes #560
Drugs remove craving when used
Added advanced UPS that runs on plutonium at a rate of 1 plutonium per 500 charges. Doesn't allow the character to unload partially depleted plutonium and won't over fill the device if it can't fit a full plutonium. So no cheesing and no wasting materials :)
Merge CBM enhancements, butchering enhancements, drug craving abatement and flaming weapons.

Conflicts:
	bionics.cpp
Merge flaming weapons
reverted #188 as the flag introduced there is not supported on older versions of GCC (doesn't compile on OSX 10.7.5 and few others
Initial skeleton of a guide for editing features of the game that do NOT
require a recompilation of the source code.
tagging/inscribing no longer wastes charge when canceled.

Fixes bug described in issue #1728.
Fixed inconsistent steel requirements in metal arrow shaft recipe

Fixed bug described in issue #1735.