REDUX - Adds combat chainsaw.
Adds flintlock weapons and ammo

Nothing much, just adds flintlock weapons.
Item groups and typos
Typos again
Come on Jenkins! Man up!
For BEEPS sake Jenkins!
Merge combat chainsawwww.

Conflicts:
	data/json/construction.json
	data/json/items/tools.json
	data/json/recipes/recipes.json
	src/item_factory.cpp
	src/iuse.h
Bee AI

Makes bees a little more responsive.
Merge flintlock pistol and rifle.

Conflicts:
	data/json/recipes/recipes.json
Merge bee AI fix.
Fix flubbed merge.