Mutations to json Step 1
Merge branch 'mutations' of https://github.com/OzoneH3/Cataclysm-DDA

Conflicts:
	player.cpp
	weather.cpp
Jsonize Mutations Step2. It runs!
Small mutations update
Mutations jsonized.
Resolved some conflicts

Conflicts:
	game.h
	iuse.cpp
	mutation_data.cpp
Fixed automerge error
Moved categories from mutation_cat.json into mutations.json
Save Traits, Mutations and Mutation category levels by name.
Combined traits.json and mutations.json
Recalc mutation_category_level on load and after mutation changes.
Resolved Conflicts: iuse.cpp, mutation.cpp
Removed accidently commited files.
Merged: https://github.com/CleverRaven/Cataclysm-DDA/pull/2496

Prevent random selection of conflicting traits.
Set mutation_category_level after creating a new game.
Note to self: Always make before commit ...
allowed points to be negative in character building
Reduce damage dealt by corpse-filled pits.
allowed points to be temporarily negative in character building
Merge branch 'master' of github.com:fiddlerwoaroof/Cataclysm-DDA

Conflicts:
	newcharacter.cpp