Merge branch 'master' of https://github.com/QuantumTangler/Cataclysm-DDA into merge
Merge branch 'hobo' of https://github.com/illi-kun/Cataclysm-DDA into merge
Merge branch 'jumping_spider_patch' of https://github.com/cdepatie/Cataclysm-DDA into merge
Remove duplicate headlight

There's already a headlight there; this line was a third light which was
present and I'm presuming was a mistake.  If it wasn't, whoever put it
in can PR its re-addition and I'll merge that.

-KA101.
Use things other that CDs for music
Merge pull request #7487 from KA101/gengineering

Fur & sleeping
Fixes discrepancy in crossbow trap.

As reported here:   http://smf.cataclysmdda.com/index.php?topic=6319.0
remove some UI calls from overmap creation
Speedup SDL version with footsteps:

Move the common code of the two version of game::draw_footsteps (sdl/curses) into a single function game::calculate_footstep_markers in game.cpp
Move the remaining code that adds the footsteps to w_terrain into game.cpp as it is the same for SDL (when not using cata_tiles) and curses: game::draw_footsteps.
Skip drawing the footsteps with game::draw_footsteps when cata_tiles is used. cata_tiles, instead let cata_tiles grab the footstep itself.
This last step removes a second call of wrefresh(w_terrain) when cata_tiles is used (first in game::draw_ter, second in game::draw_footsteps).
cata_tiles will draw the terrain when wrefresh(w_terrain) is called, this happens now once only.
Use input_context in auto_pickup.cpp: test_pattern
use input_context in player.cpp: player::disp_info
Use input context in overmap::draw_overmap (when moving through search results)
use input_context in src/defense.cpp
use input_context in game::handle_key_blocking_activity
Remove long input(long ch) - not used anymore

Remove get_keypress, move its code into input_manager::get_input_event,
because it's not needed anywhere else and is actually only used on NON-TILES builds. TILES builds use the SDL input.
check curammo for being NULL in item::reload
Refactor struct trap

Made some members to private, added getters for them.

Added trigger function, common for monster and player
Added can_see function to check for visibility.
Add missing visibility check for traps in cata_tiles
trigger existing traps when placing a new one there.

If the character sees the existing trap, don't trigger just tell.
Merge pull request #7498 from Rivet-the-Zombie/crossbow-trap-recipe-fix

Fixes discrepancy in crossbow trap.