Fix tiles font loading, maybe.
Fix wincurse maybe.
More fixage, probably.
fix offsets inconsistency in stats menu
more border_colors!
Add disassemble to amp circuit

part of the recipe and common source
Merge pull request #4816 from Mattamue/e-scrap-amp

Add disassemble to amp circuit
US spelling fix
Merge pull request #4817 from BDR1985/patch-2

Aluminum spelling fix
Merge pull request #4788 from yobbobanana/sdlfixmaybe

Fix wincurse FONTDATA initialization.
Merge pull request #4801 from illi-kun/stats_menu

fix offsets inconsistency in stats menu
Merge github.com:CleverRaven/Cataclysm-DDA into creature-rework

Conflicts:
	src/player.cpp
Revert "fix offsets inconsistency in stats menu"

This reverts commit fe123738959d21f3b2d4287f2a6a63032377d58e.
Merge branch 'master' into creature-rework