Use jpgs instead of pngs for images so that iOS 6 devices work.
Merge branch 'master' into staging
Add hack to make iOS 6 work, but revert normal operation to using pngs, so card colour animations work.