Merge pull request #1 from vikinghug/master

Upstream update
Merge pull request #7 from vikinghug/development

New Inventory design
Merge pull request #2 from vikinghug/master

Development
Merge pull request #11 from vikinghug/master

Updating to same commits
Merge pull request #13 from vikinghug/development

Merge pull request #11 from vikinghug/master
Merge pull request #14 from vikinghug/master

Merge pull request #13 from vikinghug/development
replaced wndmanagement string with Viking
Merge pull request #15 from Crowdedlight/master

replaced wndmanagement string with Viking
removed extra )

Extra ) at line 276 was being mean and caused problems
Merge pull request #16 from squidz/patch-1

removed extra )
Updated APIVersion to 9
Update toc.xml
dont show salvage window if scrappy is loaded

fixes issue #12
fix whitespace to match the rest of the project
change to OTBS
Merge pull request #19 from midraal/origin/patch-1

dont show salvage window if scrappy is loaded
Ported to new Salvage Window based on Carbine diffs.
Merge pull request #20 from Therzok/newSalvage

Ported to new Salvage Window based on Carbine diffs.
Merge pull request #21 from vikinghug/test-180

Test 180
Merge pull request #22 from vikinghug/master

Getting up to speed