installed django-compressor
Merge branch 'master' into dev
removed media and static folders