allows compiling with visual studio
Generalizing line algorithms for three dimensions, refactoring.
reverting changes to itype.h
Further refactoring, integer-based iterative line generation in three dimensions.
cleanup
MESSY now works for NPC's and player hits.
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA into MESSY_NPC

Conflicts:
	src/melee.cpp
Removed redundant includes, made virtual functions of monBloodType and monGibType. (needed to remove some includes to remove compiler errors).
removing tuples, tweaking continue_line to make things line up better in case debugging is needed.
define height of the sort_armor window according to worn.size()
Returns a burnt_out_bionic when the player successfully removes a bionic.
Fix Mac compile error

Hadn't seen this on C::B, no idea if it happened there or not.  In any
event, this should clear it up.

You're welcome for the buff, too.  ;-)
Merge pull request #6772 from KA101/FixMutation

Fix Mac compile error
Cyclists
Fixed the whoops! in the description
Make the format parameter to string_format an obect, not a reference

Apparently va_start does not like to work with references.
remove input_manager::action_to_input

The default context is now part of the action_contexts map.
The loading code would put input events for the context "default" into action_to_input, so action_contexts could never contain an entry for key "default".
Making this two separate members complicates both loading and saving the data and has no actual advantage.
implement input_manager::save to save keybindings
add functions and user interface to change keybindings
Add some keycode names and return unknown key xxx for those.