ImageCache binding, battle config is having weird singleton issues
Merge remote-tracking branch 'origin/master'