Add note about ommitting TILES flag to use ncurses, which I snipped off.
Implements primitive cotton industry.

Adding even more self-sufficiency.

New recipes.
Cotton seeds.
Cotton farming.
Cotton bolls.
Carding paddles.
Cotton cleaning.
Cotton balls.
Distaves and spindles.
Cotton spinning.
Knitting needles.
Knitting.
Fix for misc. repair kits.

They had no check to prevent them from being used on guns. This fixes
it.
Merge pull request #7704 from Rivet-the-Zombie/cotton-farming

Implements primitive cotton industry.
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA
Diazepam improvements.

Now also cures the shakes, new recipe, implementation in another recipe,
some modified numbers in the .json entry.
Merge pull request #7706 from Rivet-the-Zombie/Valium-recipe

Diazepam improvements.
Deletes extra bracket

Should have caught this earlier.  :-/
Merge pull request #7707 from KA101/bracketfix

[buildfix] Deletes extra bracket
Gives a small morale bonus to diazepam.

Valium is a commonly abused drug.
I believe this fixes #7628. Seemed to just be a bit of logic mixup.
Space fix.
Tweak.
Tweak.
Having not used astyle before, I was copying-pasting too literally into vim and not reading the error message. Simple fix, and I'm now an astyle convert.
Merge remote-tracking branch 'dda/pr/7626' into dda-master

* dda/pr/7626:
  Apply the main CXXFLAGS to `make json-check`.
  Fix compile errors under mingw-w64.
  Apply namespacing correctly for pow to handle more pedantic compilers, and shuffle around types used to take advantage of new type promotion rules.
  Include iterator to make VC happy.
  ssize_t was more trouble than it was worth.
  Fixes to make compilation work with c++11. (#7626)
  Convert options table to an unordered map.
  Fix .cbp syntax.
  Enable c++11 compilation and use a few of the features.

Conflicts:
	src/item.cpp
No more straight river edges
Merge remote-tracking branches 'dda/pr/7683' and 'dda/pr/7703' into dda-master

* dda/pr/7683:
  Relocate player_activity tag
  Nerf and underwater-compatibility
  Clarify language
  Balancing and spawn points
  First stage

* dda/pr/7703:
  Add note about ommitting TILES flag to use ncurses, which I snipped off.
  I believe this fixes #7684. Flipped logic around in the makefile so one can still use SDL=1 but gets the same results as TILES=1. Built both on my system (Mac) and tested and everything seems fine.
Makes diazepam more interesting all around.
Make metal and glass doors non-barricadable until we can figure out how to reverse the process without turning them to wood. Thanks Fish.