Merge remote-tracking branch 'origin/master'
added new subscription setting to client
setting times for subscriptions done. long overdue subscription tests written