Remove game *g parameter from palyer::i_rem().
Cleanup veh_interact::cant_do() and fix tire change requirement checking.
Add vehicle tags field to hold vehicle metadata.
Add folding bicycle and associated logic.
floor divergence contributed from skills and stats at 0, no negative divergence.
Remove some redundant FMJ variants, and make the descriptions clearer that FMJ isn't armor piercing.
Move tire change operation to its own menu item.
Fix a typo.
Fix logic fail preventing removal of parts on mount points.
Some new crafting recipes.
Bugfix: crash when listing items around the player
Merge PR#1890 - Folding bicycles

Conflicts:
	data/raw/items/tools.json
	item_factory.cpp
	iuse.cpp
	iuse.h
Further merge fixes
Merge PR#2032 - new recipes
Merge PR#2014 - FMJ cleanup
Merge PR#1962 - No negative divergence
Merge PR#2034 - Examine crash fix
Make counterattacks a free action to avoid counter-locking the player.
Fix % format string bug for @ menu info window.
Merge branch 'master' of github.com:CleverRaven/Cataclysm-DDA into wwfix