Fix missing roof in luxury_rv's bottom middle tile
Explicitly track crafting batch size instead of stashing it in the recipe.
Whitespece cleanup.
Make accessors for recipes as const as possible.
should fix most of the merge errors/misclicks
Adjust down starting ammo for rifle and BMG turrets.
small description typo fix
Merge branch 'update-dehydrated-fruit-description' of https://github.com/jcd000/Cataclysm-DDA into merge2
Merge branch 'configurable-bot-ammo' of https://github.com/kevingranade/Cataclysm-DDA into merge2
Fix text error

Thanks for the catch, Mshock777.
Update gun sound handling to treat gunmods properly.
Add range attribute to gunmods.
Factor new range attribute into gunmod range.
Add range attribute to rail-mounted crossbow.
Add rail-mounted crossbow to the pile of horrible hacks that is mod unloading.
Nausea & Vomitous On Demand

For the Canadian folks:
http://smf.cataclysmdda.com/index.php?topic=3982.msg181013#msg181013
http://smf.cataclysmdda.com/index.php?topic=3982.msg181082#msg181082

(And it's realistically a poor-survivor's blood filter: reduces drunk,
food poisoning, etc.)
Restores minor stimulant effect to survivorcraft teas.

Caffeine fiends rejoice, thy fix is nigh.
Merge pull request #9531 from Rivet-the-Zombie/tea-revert

Restores minor stimulant effect to survivorcraft teas.
Save backlog properly, fixes issue where a new craft action might resume an old craft action.
Mycus tweaks

Apples provide more quench and less fun, and only give mutations if you
don't yet have Feeder; active spore-use is cheaper, mutations are now a
one_in 8 every time you have a dream.