xblock storage, named usages
Merge branch 'master' of https://github.com/pmitros/x2