Fixed some django-compressor issues
Merge branch 'feature/push-state' into staging