Merge pull request #5897 from Rivet-the-Zombie/eyedrops

Adds eye drops, saline solution.
Conflicts:
	data/json/item_groups.json
	data/json/recipes/recipes.json
Merge pull request #5901 from MisterFelixFox/survivor-armor-typo-fix

Survivor armor typo fixes
Merge fixes to SDL coordinate handling.
Merge pull request #5899 from Rivet-the-Zombie/chem-volume-adjustment

Doubles charges-per-volume of ammonia and bleach.
Merge pull request #5906 from Chase-san/patch-1

Fixing elfa ear mutation exclusiveness (or lack there of)
Merge pull request #5910 from BevapDin/create-activity-class

Make pulping corpses and using pickaxe into player activities.
Conflicts:
	src/iuse.cpp
Merge pull request #5923 from BevapDin/fix-wrong-skills

fix using wrong skill idents & debug message on unknown skills
Conflicts:
	data/json/recipes/recipes.json
Merge branch 'diseasefix' of https://github.com/9600bauds/Cataclysm-DDA into 9600bauds-diseasefix
Merge pull request #5924 from Rivet-the-Zombie/waterskins

Adds two more sizes of craftable waterskins.
Conflicts:
	data/json/recipes/recipes.json
Added waterskins.
Merge pull request #5930 from KA101/TSM-Morale

TSM: now rewarding for Cannibals
Merge pull request #5934 from illi-kun/Fix_for_Studio2012

Include player_activity.* in MSVC11 project
Merge pull request #5919 from illi-kun/patch-3

Change default and minimum terminal height
Merge pull request #5935 from illi-kun/newchar_win

Tweaks for new char menu
Merge pull request #5936 from VlasovVitaly/add-mod-strings-to-gettext

Add mod strings to gettext
Merge pull request #5940 from kevingranade/cleanup-lightmap

Cleanup lightmap
Merge pull request #5942 from illi-kun/fix_other_msvc_projects

include player_activity.* files in msvc 100 & 120 projects
merge fixes