removed .bak file
Merge remote-tracking branch 'upstream/master'
Revert "Merge remote-tracking branch 'upstream/master'"

This reverts commit 31ed998b83006b6a57e122f2034243aa5d24f1db, reversing
changes made to 71db3a11d275770e0429750d2d4d1681c27bfc73.
Revert "Revert "Quest Data Gatherer now saves to Carbonite.Quests.lua""

This reverts commit 71db3a11d275770e0429750d2d4d1681c27bfc73.
Revert "Quest Data Gatherer now saves to Carbonite.Quests.lua"

This reverts commit b127c04e40eb2b5906be62247532074c94e270ea.
Revert "Revert "Quest Data Gatherer now saves to Carbonite.Quests.lua""

This reverts commit 71db3a11d275770e0429750d2d4d1681c27bfc73.