Added shuffle everywhere.
Watched/unwatched, Server add/remove
Watched/unwatched, Server add/remove
Merge branch 'master' into dev