Added translation from list of consumptions to list of points.
Fixed some colors in the graph view.
Preparing merge.
Merge branch 'graphviewconsumption' into develop
Merge branch 'tests-49705916' into develop
bug fixes and updates
Merge branch 'devAPI' into API
Fixed merge conflicts when merging API into develop.
Fixed some errors after merge with API.
Fixed transition between LoginActivity and MainActivity.