Removed skill gap in first aid crafting.

Now, you won't need to purposefully hurt yourself and bandage yourself 20 times to go from level 2 to 3 if you are missing a book late in the game.
Fix to change to what was intended.
Fix price calculation for tools.

Apparently item::curammo is not set for tools that have been reloaded, but
that is used to indicate that the tools does not use real ammo. Instead the function assumes that the tools contains some unspecific ammo (like the spray in a spray can) and
calculates the price of the whole item based on the remaining charges.
Don't say all bionics are lost if the player has power storage.

I got the message "All of your existing bionics are lost!" and thought the three Power Storage CBMs I'd just installed were lost. Nope.

You can lose power capacity from a botched installation, but that's a different fail_type.
Tweaks to caffeine in beverages.

Chocolate drink, herbal tea, and dandelion tea are now caffeine-free. The usual commercial chocolate-flavored beverages (e.g., Nesquik, Yoo-Hoo) aren't caffeinated. Teas described as "herbal teas" are generally caffeine-free. And dandelions don't contain caffeine.

Cream soda is still caffeinated, but that's mentioned in the description now.
Merge branch 'fix-prices-again' of https://github.com/BevapDin/Cataclysm-DDA into merge
Merge branch 'all-bionics-message' of https://github.com/Kodiologist/Cataclysm-DDA into merge
Merge branch 'caffeine-tweaks' of https://github.com/Kodiologist/Cataclysm-DDA into merge
Fix JSON

Happens to all of us.  Even me.  ;-)
Merge pull request #9434 from bug-sniper/change_bandage_diff

Removed skill gap in first aid crafting.
Revert "Removed skill gap in first aid crafting."
Merge pull request #9523 from CleverRaven/revert-9434-change_bandage_diff

Revert "Removed skill gap in first aid crafting."
Merge branch 'master' into diaperfur