made the RIGID flag work for containers

Container without that flag add the volume of their content to the total volume of the item.
Container with that flag show just the containers volume and ignore the content.
fix waterskin2, should have different volume, not bash modi
Electronic cigarettes.
Removed unused code.
Specify that some e-cigs are disposable.
Add e-cigs to item groups.
Set turns_per_charge to 1 instead of 20, just in case - not sure if it's necessary.
Better description of advanced e-cigs.
More vehicle stuff

Added Mark 19 Grenade Launcher and fixed the APC so it was more of an
APC and less of an armored bus. Plans to add Electrified Hull Plating,
Impact Resistant Hull Plating (For plows), and set up turrets to not
blow up their own vehicle. Also added M2 Browning and Mark 19 to the
bunker heavy weapons spawn.
Fixed the Turrets.

And some typos. Also laid the groundwork for the Electrified Plating and
the Impact Resistant Plating.
What Bug?

There is no bug. You saw nothing. No lazy copy/paste that I forgot to
fix properly. You saw nothing.
Pulled Elec and Impact Resist Plating

Because I have no idea how to do it and people are excited enough for
what's done as is.
re-add rename action to vehicle interaction
Better names to various QUIT keybindings
Fix keybinding names collisions

Keybindings in different contexts with identical action IDs were misbehaving.

An single ID -> name map was used to hold names for all actions across all
contexts. This caused incorrect names to appear in keybindings menus e.g.
"Remove bionics" would show up in the vehicle keybindings menu where one would
expect "Remove part".

This patch moves actions' names from the ID -> name map to the action_contexts
object.
Merge remote-tracking branch 'upstream/master' into keys

Conflicts:
	src/input.cpp
	src/input.h
Remove second write of the id of the artifact.

This makes the json file invalid as the id member appears twice. The parser would ignore this, but now it checks for this situation and fails to load the artifact.
only load action name when it is present
add action_name_overrides
Differentiate the two "Select" hotkeys. Remove unused "Select" hotkey