dashboard error and static url issue
Merge branch 'edraak/core-changes' of https://github.com/Edraak/edx-platform into edraak/core-changes