add expires headers to static django files
Merge remote-tracking branch 'origin/master'