merging sparse coding commit
merging sparse coding commit


Former-commit-id: f259639cfb1fd90f5c73ee1b955e24d93acc5fa0
Former-commit-id: 2cac09b63bf35f889737244fd5646afb431ef2ce
dssg/wikienergy,dssg/wikienergy,dssg/wikienergy,dssg/wikienergy,dssg/wikienergy