Added support for PowerStrip naming.
Merge remote-tracking branch 'origin/devAPI' into develop
Fixed names on power strips.
Merge branch 'develop' of https://github.com/Soetnowzen/SmartPower into develop
Added robotium tests.
Added some tests for robotium.
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.
Oncreate now takes User as param
Added input to change Date start and end
Added alertDialogBox xml with 2 inputBoxes
RemoteFragment uses doubleinput.xml