more fixes
Merge branch 'master' of github.com:hembergerik/sprint_ec_openedx