Conflicts: src/app/partials/dashboard.html src/app/partials/dasheditor.html src/app/services/graphite/graphiteDatasource.js
