Added PsSocket constructor from JSONObject, and fixed method connected to favorties
Fixed merge conflicts with stash pop