Removed a newline to test the rebase function.
Added support for setName in PowerStrip, and some bugfixes in User.

Signed-off-by: bregell <johan_bregell@hotmail.com>
Fixed conflict
Merge branch 'devAPI' into API
Fixed merge conflicts when merging API into develop.