some slight changes to mod manager
allow mods to override existing item definitions
allow mods to append to item groups
move a profession to the furry test mod
add combat_skill tag
Changes in some professions skills out of logic

-Removed the Butler/maid throwing skill.
-Reduced the Ballroom Dancer dodging skill to 1.
-Removed the dodging skill from mail carrier.
-Removed the melee skill from Convict.
Merge remote-tracking branch 'upstream/master' into mod-man

# By Lain- (15) and others
# Via Rivet (8) and others
* upstream/master: (50 commits)
  Contraband
  Bracket glitch & proportionality
  extend the definition of conflicting traits
  comma fix
  Booking-checkup
  HP fix: part 2
  one more entry
  Color fix.
  one more entry
  Fix for HP calculation bug reported by BorkBorkBork in IRC.
  make the cx4 storm moddable like wikipedia says
  Change requirement from Survival 1 to Fabrication 1
  Fixes wooden needle spacing in code
  Add wooden sewing needle
  display volume capacity after dropping worn items
  dropping weapon only affects weight, not volume
  put the empty lines back in
  print item description with a single call to fold_and_print, don't use word_rewrap
  Change iron javelin requirements from trapping to throwing
  Nerfed mustard nutrition value
  ...

Conflicts:
	data/json/recipes/recipes.json
Give the Ballroom Dancer his dodge point back
remove MT_UNKNOWN mod type, was useless anyway
slight change to where the mods are supposed to store their data files
resolve some minor display glitches
gave bionics a valid color
made a check-all-mods parameter for the program that loads all mods and check the consistency

fixed some bugs encounter with this

exported bio-guns (pseudo items used by bionics) to json
implement delayed loading of types
catch errors from json loading
add another bunch of test mods: gardener
MOAR BELTS!
More gi, item groups for belts and gi.
belt map colors corrected
Tabi da!
Fixed Issue #3062: Plasma from Fusion Effects does no damage.
All the gi!
create DynamicDataLoader class that takes care of the type_function_map and loading that dynamic stuff
also astyled init.cpp
Adds geta to complete the set.