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.
fix comma
option to change the language
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.
Smoking cigarettes now takes time
Added cig_lit, cig_butt, cigar_lit, cigar_butt items
Reduced cigar charges to 5
New types of smoke- cigarette smoke and weed smoke, can see through and
have no effect on anything
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA into cigaweed
Added smokable joints
Tweak pot smoke field
Cigarettes now get affected by tolerance and lightweight traits
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA into cigaweed
Random message now occasionally printed when smoking weed
Can now cancel smoking weed from pipe/joint menu
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA into cigaweed
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA into cigaweed
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA into cigaweed

Conflicts:
	SIGNOFF
Fixed the Turrets.

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