Merge pull request #13 from cavedude00/master

merge from cavedude00:master
Merge pull request #14 from cavedude00/master

merge from cavedude00:master
Merge pull request #15 from cavedude00/master

merge from cavedude00:master
Merge pull request #16 from cavedude00/master

merge from cavedude00:master
Merge pull request #17 from cavedude00/master

merge from cavedude00:master
Merge pull request #18 from cavedude00/master

merge from cavedude00:master
Merge pull request #19 from cavedude00/master

merge from cavedude00:master
Merge pull request #20 from cavedude00/master

merge from cavedude00:master
Merge pull request #21 from cavedude00/master

merge from cavedude00:master
Merge pull request #22 from cavedude00/master

merge from cavedude00:master
Merge pull request #23 from regneq/master

fix for temp merchant lists not loading correctly
Merge pull request #24 from regneq/master

fixed for item clicky.
Merge pull request #25 from regneq/master

merge from cavedude00:master
Merge pull request #26 from regneq/master

merge from regneq:master
Merge pull request #27 from cavedude00/master

merge from cavedude00:master
Merge pull request #28 from regneq/master

merge from regneq:master
Merge pull request #228 from takpemu/master

merge from cavedude00:master