Sync with local server
sync with local server
Merge branch 'dev' of https://github.com/sicoscorpion/energyDashboard into dev