Merge branch 'master' into session-manager
added new tab blocking feature to session manager
added tab blocking to options page
Merge branch 'session-manager'