merging sparse coding commit
merging sparse coding commit


Former-commit-id: 3e633195e50f6f7c09830932ae944c3948d163c5 [formerly 2cac09b63bf35f889737244fd5646afb431ef2ce] [formerly f259639cfb1fd90f5c73ee1b955e24d93acc5fa0]
Former-commit-id: 969d2db49696337a8456931dca81154b74e47c12
Former-commit-id: c7e4bbaf681dcd131013e54c55f6cf80ef7e2d1d
dssg/wikienergy,dssg/wikienergy,dssg/wikienergy,dssg/wikienergy,dssg/wikienergy