Merge branch 'master' of E:\Users\Ben Dixon\My Documents\Development\Mod Sources\TopazMod with conflicts.
Merge remote-tracking branch 'origin/master'
Fixed ConfigurationHandler