Merge pull request #784 from fenyo1/STR_CRAFTNAME

More freedom for translators: Possibility to change the "Craftname-number" scheme.
std::find MUST have a non-empty vector, turns out

fix a few crashes in AI/pathing/stuff that i added recently
oh, that makes more sense

revert previous commit, make unitsSpottedThisTurn() a reference
Merge remote-tracking branch 'upstream/master' into loadout_copy_paste
fix autoshot edge case
needs more const
adjustment: use melee skill and modifiers on melee attacks
Merge branch 'master' into typofixes

Conflicts:
	bin/data/Language/en-GB.yml
	bin/data/Language/en-US.yml
fix blaster launcher bug
Merge branch 'includePrimeStateInSavedLayout' of https://github.com/fenyo1/OpenXcom into fenyo1-includePrimeStateInSavedLayout
don't give anything but grenades fuses, it's bad.
hey getlocalization, look! tasty new strings
Merge pull request #782 from cfailde/typofixes

Proofreading en_GB and en_US language files
Merge pull request #780 from fenyo1/MusicExpansion

Ok, we can have even GMGEO9 and GMTACTIC9 now.
overhaul the overhaul

seperate game resolution into battle and geo flavours, and switch as appropriate

remember folks: changing the base res is highly experimental, and not fully supported.
it works as far as i can tell but don't expect perfection.
how did that even compile locally i don't even
Merge remote-tracking branch 'upstream/master' into loadout_copy_paste
adjust to new arg list for EquipmentLayoutItem
avoid memcpy of overlapping palette memory
Static analysis fixes.