Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA into scabbard
Merge remote-tracking branch 'upstream/master' into aoe-fix
merged upstream
remove space from translated string
Merge branch 'minortweak' of https://github.com/Lain-/Cataclysm-DDA into Lain--minortweak
Implemented lua accessors to item groups.

This allows to add or remove items to/from groups using lua. The sample mod implements a simple "blacklist" feature that only blacklists spawns, not recipes.
Added a generate_wikidocs.lua
Conflicts:
	src/mtype.h
	src/tile_id_data.h

Straightforward.
Fix for V search crash issue #6900.
Extended wrapper generator with the ability to have a different cpp_name and lua name for attributes.
Added/changed several itype wrappers.

I changed a few attributes from their previous names to make them have the same name as in the JSON. Modders are more likely to be familiar with JSON than with C++.
line_to won't crash now when drawing from/to same spot (#6900).
Forgot the return.
Merge pull request #6949 from KA101/CBMReorg

CBM reshuffle
Merge some bugfixes.
Merge a pile of lua functionality.

Conflicts:
	lua/class_definitions.lua
Makes egg-based mutagens a bit more achievable

Worked out the math on egg-finding and was rather disconcerted to find
that reptile eggs are so bloody rare.  Assuming you make the veggy roll,
it's 3.8% for reptile eggs.

Lizard isn't *that* good a category, and you shouldn't have to strip a
whole forest of its underbrush to get Raptor or Alpha mutagen.
Coughing 1
Fix missing paren
Change non-standard "standard" option name