Resolved conflict with std::abs in msvc2013.
possibly related to PR#7275
Resolving Merge conflicts
Fixes plant fiber price.

Same as with the sinew, just forgot that plant monsters give thread too.
Merge extraction of turns and message metods from game object.

Conflicts:
	src/action.cpp
	src/game.cpp
	src/monattack.cpp
	src/npcmove.cpp
Astyle messages module.
Change lua binding of add_msg too.
Use getch in game::death_screen instead of get_input

This follows the dialog that appears ("Press Spacebar to Quit").
astyle game::list_factions
use redraw variable to redraw the fractions dialog when the selection has changed.
Use input_context in game::list_factions instead of get_direction
Use input_context in game::list_missions
astyle game::msg_buffer
Use input_context instead of get_input in game::msg_buffer
Fix some warning about signed/unsigned values

Also fix the indentation in list_factions
Remove the InputEvent enum and the two functions that still use it.

Those two functions and the enum are not used anywhere else. Finally.
Use item::use_charges and item::use_amount in map.cpp

Use long as type for the charges, as charges are stored as long.
Merge commit '217c775ab82da2b0937552df1833001704f295bd' into FrankenMod

Conflicts:
	src/advanced_inv.cpp
	src/bionics.cpp
	src/disease.cpp
	src/game.cpp
	src/game.h
	src/iuse.cpp
	src/melee.cpp
	src/mondeath.cpp
	src/npctalk.cpp
	src/player.cpp
	src/ranged.cpp
	src/veh_interact.cpp
Merging unmerged branches. :)
Merge remote-tracking branch 'Rivet-the-Zombie/fiber-price' into FrankenMod
Merge remote-tracking branch 'BevapDin/input-manager-game.cpp' into FrankenMod

Conflicts:
	src/game.cpp
	src/messages.cpp
	src/messages.h