Merge branch 'master' of github.com:Ryan-Myers/gw2spidy into Replace_GW2DB