jMerge branch 'master' of https://github.com/dssg/wikienergy
jMerge branch 'master' of https://github.com/dssg/wikienergy


Former-commit-id: 6827b64143b9cef740c62c7b570e4dac33ff68ae
Former-commit-id: b485168731353b9804d8a7f84d9aa6a09ab58656
dssg/wikienergy,dssg/wikienergy,dssg/wikienergy,dssg/wikienergy,dssg/wikienergy