Merge branch 'develop' into API
Merge branch 'API' into devAPI
PowerStrip and PsSocket now supports status. getStatus returns saved state and updateStatus retrives the current state from the server
Bug fix in UserFragment
Fixed bug in server message parsing, also modified setName in PsSocket and PowerStrip.
Merge branch 'devAPI' into API
Merge remote-tracking branch 'origin/API' into develop