Added toJSON to be able to save user. Also now have an update function that updates the child object of that class
Turnon and Tornoff in PsSockets waits for ack from powerstrip
Merge branch 'devAPI' into API
Fixed merge conflict when merging API into UI branch.