allow override for STATIC_URL
Merge pull request #1690 from edx/jarv/static-url

allow override for STATIC_URL
resolving merge conflicts